diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-20 22:42:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-20 22:42:54 -0700 |
| commit | 136e8e829fb7ecfe7ec8ce5c00b0a4dc36c70826 (patch) | |
| tree | 0000009553fb4c04f5fd5a62799d3ae10d05a303 /src/yuzu/applets/software_keyboard.cpp | |
| parent | ea4e4b05e4c05b704646a65a4bf98f218dbb867a (diff) | |
| parent | 5396593b55946284f3f5d9d776d5417f1ba79151 (diff) | |
Merge pull request #6333 from Morph1984/swkbd-confirm-text
applets/swkbd: Send the correct text string on TextCheck::Confirm
Diffstat (limited to 'src/yuzu/applets/software_keyboard.cpp')
| -rw-r--r-- | src/yuzu/applets/software_keyboard.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp index 653486493..b0f764994 100644 --- a/src/yuzu/applets/software_keyboard.cpp +++ b/src/yuzu/applets/software_keyboard.cpp @@ -404,12 +404,16 @@ void QtSoftwareKeyboardDialog::ShowTextCheckDialog( OverlayDialog dialog(this, system, QString{}, QString::fromStdU16String(text_check_message), tr("Cancel"), tr("OK"), Qt::AlignCenter); - if (dialog.exec() == QDialog::Accepted) { - emit SubmitNormalText(SwkbdResult::Ok, current_text); + if (dialog.exec() != QDialog::Accepted) { + StartInputThread(); break; } - StartInputThread(); + auto text = ui->topOSK->currentIndex() == 1 + ? ui->text_edit_osk->toPlainText().toStdU16String() + : ui->line_edit_osk->text().toStdU16String(); + + emit SubmitNormalText(SwkbdResult::Ok, std::move(text)); break; } } @@ -480,11 +484,7 @@ void QtSoftwareKeyboardDialog::open() { void QtSoftwareKeyboardDialog::reject() { // Pressing the ESC key in a dialog calls QDialog::reject(). // We will override this behavior to the "Cancel" action on the software keyboard. - if (is_inline) { - emit SubmitInlineText(SwkbdReplyType::DecidedCancel, current_text, cursor_position); - } else { - emit SubmitNormalText(SwkbdResult::Cancel, current_text); - } + TranslateButtonPress(HIDButton::X); } void QtSoftwareKeyboardDialog::keyPressEvent(QKeyEvent* event) { |