ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7846 from spycrab/qt_no_ticks 

Qt/MappingButton: Don't show ticks
This commit is contained in:
spycrab 2019-03-04 01:29:48 +01:00 committed by GitHub
parent 66a8220011 386accd2c8
commit 13b2b93d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
View File

@ -33,9 +33,11 @@
constexpr int SLIDER_TICK_COUNT = 100; constexpr int SLIDER_TICK_COUNT = 100;
static QString EscapeAmpersand(QString&& string) // Escape ampersands and remove ticks
static QString ToDisplayString(QString&& string)
{ {
return string.replace(QStringLiteral("&"), QStringLiteral("&&")); return string.replace(QStringLiteral("&"), QStringLiteral("&&"))
.replace(QStringLiteral("`"), QStringLiteral(""));
} }
bool MappingButton::IsInput() const bool MappingButton::IsInput() const
@ -44,7 +46,7 @@ bool MappingButton::IsInput() const
} }
MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref, bool indicator) MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref, bool indicator)
: ElidedButton(EscapeAmpersand(QString::fromStdString(ref->GetExpression()))), m_parent(widget), : ElidedButton(ToDisplayString(QString::fromStdString(ref->GetExpression()))), m_parent(widget),
m_reference(ref) m_reference(ref)
{ {
// Force all mapping buttons to stay at a minimal height. // Force all mapping buttons to stay at a minimal height.
@ -190,7 +192,7 @@ void MappingButton::Detect()
void MappingButton::OnButtonTimeout() void MappingButton::OnButtonTimeout()
{ {
setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression()))); setText(ToDisplayString(QString::fromStdString(m_reference->GetExpression())));
} }
void MappingButton::Clear() void MappingButton::Clear()
@ -206,7 +208,7 @@ void MappingButton::Update()
const auto lock = ControllerEmu::EmulatedController::GetStateLock(); const auto lock = ControllerEmu::EmulatedController::GetStateLock();
m_reference->UpdateReference(g_controller_interface, m_reference->UpdateReference(g_controller_interface,
m_parent->GetController()->GetDefaultDevice()); m_parent->GetController()->GetDefaultDevice());
setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression()))); setText(ToDisplayString(QString::fromStdString(m_reference->GetExpression())));
} }
void MappingButton::mouseReleaseEvent(QMouseEvent* event) void MappingButton::mouseReleaseEvent(QMouseEvent* event)