summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
index 638a0d0ac8..6e1a2fa813 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -33,9 +33,11 @@
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
@@ -44,7 +46,7 @@ bool MappingButton::IsInput() const
}
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)
{
// Force all mapping buttons to stay at a minimal height.
@@ -190,7 +192,7 @@ void MappingButton::Detect()
void MappingButton::OnButtonTimeout()
{
- setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression())));
+ setText(ToDisplayString(QString::fromStdString(m_reference->GetExpression())));
}
void MappingButton::Clear()
@@ -206,7 +208,7 @@ void MappingButton::Update()
const auto lock = ControllerEmu::EmulatedController::GetStateLock();
m_reference->UpdateReference(g_controller_interface,
m_parent->GetController()->GetDefaultDevice());
- setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression())));
+ setText(ToDisplayString(QString::fromStdString(m_reference->GetExpression())));
}
void MappingButton::mouseReleaseEvent(QMouseEvent* event)