mirrors/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5362 from SutandoTsukai181/swkbd

Browse source 
applets/swkbd: Fix button order received from button_text
This commit is contained in:
Weiyi Wang 2020-05-25 08:22:57 -04:00 committed by GitHub
commit 028609d548
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/citra_qt/applets/swkbd.cpp
View file

@ -49,7 +49,7 @@ QtKeyboardDialog::QtKeyboardDialog(QWidget* parent, QtKeyboard* keyboard_)
break; break;
case ButtonConfig::Dual: case ButtonConfig::Dual:
buttons->addButton(config.has_custom_button_text buttons->addButton(config.has_custom_button_text
? QString::fromStdString(config.button_text[1]) ? QString::fromStdString(config.button_text[2])
: tr(SWKBD_BUTTON_OKAY), : tr(SWKBD_BUTTON_OKAY),
QDialogButtonBox::ButtonRole::AcceptRole); QDialogButtonBox::ButtonRole::AcceptRole);
buttons->addButton(config.has_custom_button_text buttons->addButton(config.has_custom_button_text
@ -59,7 +59,7 @@ QtKeyboardDialog::QtKeyboardDialog(QWidget* parent, QtKeyboard* keyboard_)
break; break;
case ButtonConfig::Single: case ButtonConfig::Single:
buttons->addButton(config.has_custom_button_text buttons->addButton(config.has_custom_button_text
? QString::fromStdString(config.button_text[0]) ? QString::fromStdString(config.button_text[2])
: tr(SWKBD_BUTTON_OKAY), : tr(SWKBD_BUTTON_OKAY),
QDialogButtonBox::ButtonRole::AcceptRole); QDialogButtonBox::ButtonRole::AcceptRole);
break; break;