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 #5738 from spycrab/qt_fix_ampersand 

Qt: Fix ampersands not displaying properly in mapping windows
This commit is contained in:
Leo Lam 2017-07-04 15:31:36 +02:00 committed by GitHub
parent e0b94b55b8 36fe1a5415
commit cf79ff2366
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,14 @@
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/Device.h"
static QString EscapeAmpersand(QString&& string)
{
return string.replace(QStringLiteral("&"), QStringLiteral("&&"));
}
MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref) MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref)
: ElidedButton(QString::fromStdString(ref->expression)), m_parent(widget), m_reference(ref) : ElidedButton(EscapeAmpersand(QString::fromStdString(ref->expression))), m_parent(widget),
m_reference(ref)
{ {
Connect(); Connect();
} }
@ -73,7 +79,7 @@ void MappingButton::OnButtonPressed()
void MappingButton::OnButtonTimeout() void MappingButton::OnButtonTimeout()
{ {
setText(QString::fromStdString(m_reference->expression)); setText(EscapeAmpersand(QString::fromStdString(m_reference->expression)));
} }
void MappingButton::Clear() void MappingButton::Clear()
@ -87,7 +93,7 @@ void MappingButton::Update()
{ {
const auto lock = ControllerEmu::EmulatedController::GetStateLock(); const auto lock = ControllerEmu::EmulatedController::GetStateLock();
m_reference->UpdateReference(g_controller_interface, m_parent->GetParent()->GetDeviceQualifier()); m_reference->UpdateReference(g_controller_interface, m_parent->GetParent()->GetDeviceQualifier());
setText(QString::fromStdString(m_reference->expression)); setText(EscapeAmpersand(QString::fromStdString(m_reference->expression)));
m_parent->SaveSettings(); m_parent->SaveSettings();
} }