mirror of
https://github.com/citra-mirror/citra.git
synced 2024-09-03 18:17:24 +02:00
Use fixed indices for button order
Apps always return 3 strings, even if there is no custom text, so the index should be constant for each button.
This commit is contained in:
parent
1255d94baa
commit
9ed6762c59
@ -49,7 +49,7 @@ QtKeyboardDialog::QtKeyboardDialog(QWidget* parent, QtKeyboard* keyboard_)
|
||||
break;
|
||||
case ButtonConfig::Dual:
|
||||
buttons->addButton(config.has_custom_button_text
|
||||
? QString::fromStdString(config.button_text[1])
|
||||
? QString::fromStdString(config.button_text[2])
|
||||
: tr(SWKBD_BUTTON_OKAY),
|
||||
QDialogButtonBox::ButtonRole::AcceptRole);
|
||||
buttons->addButton(config.has_custom_button_text
|
||||
@ -59,7 +59,7 @@ QtKeyboardDialog::QtKeyboardDialog(QWidget* parent, QtKeyboard* keyboard_)
|
||||
break;
|
||||
case ButtonConfig::Single:
|
||||
buttons->addButton(config.has_custom_button_text
|
||||
? QString::fromStdString(config.button_text[0])
|
||||
? QString::fromStdString(config.button_text[2])
|
||||
: tr(SWKBD_BUTTON_OKAY),
|
||||
QDialogButtonBox::ButtonRole::AcceptRole);
|
||||
break;
|
||||
|
@ -201,8 +201,7 @@ Frontend::KeyboardConfig SoftwareKeyboard::ToFrontendConfig(
|
||||
});
|
||||
if (frontend_config.has_custom_button_text) {
|
||||
for (const auto& text : config.button_text) {
|
||||
if (text.front() != 0)
|
||||
frontend_config.button_text.push_back(Common::UTF16BufferToUTF8(text));
|
||||
frontend_config.button_text.push_back(Common::UTF16BufferToUTF8(text));
|
||||
}
|
||||
}
|
||||
frontend_config.filters.prevent_digit =
|
||||
|
Loading…
Reference in New Issue
Block a user