diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-07-27 21:53:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 21:53:32 +0200 |
| commit | a761d020c61de5a1d354ad9721a66f4c4c9b1e2e (patch) | |
| tree | a605f15828de48138474bf3a4df46afb52cadc13 /src/core | |
| parent | Merge pull request #8592 from devsnek/sig-handlers (diff) | |
| parent | qt_software_keyboard: Fix infinite loop when moving between buttons (diff) | |
| download | yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.tar yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.tar.gz yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.tar.bz2 yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.tar.lz yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.tar.xz yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.tar.zst yuzu-a761d020c61de5a1d354ad9721a66f4c4c9b1e2e.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/frontend/applets/software_keyboard.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/applet_software_keyboard.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index a405e3c94..094d1e713 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/src/core/frontend/applets/software_keyboard.h @@ -17,6 +17,8 @@ struct KeyboardInitializeParameters { std::u16string sub_text; std::u16string guide_text; std::u16string initial_text; + char16_t left_optional_symbol_key; + char16_t right_optional_symbol_key; u32 max_text_length; u32 min_text_length; s32 initial_cursor_position; diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp index faa092957..c18236045 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp +++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp @@ -536,6 +536,8 @@ void SoftwareKeyboard::InitializeFrontendNormalKeyboard() { .sub_text{std::move(sub_text)}, .guide_text{std::move(guide_text)}, .initial_text{initial_text}, + .left_optional_symbol_key{swkbd_config_common.left_optional_symbol_key}, + .right_optional_symbol_key{swkbd_config_common.right_optional_symbol_key}, .max_text_length{max_text_length}, .min_text_length{min_text_length}, .initial_cursor_position{initial_cursor_position}, @@ -591,6 +593,8 @@ void SoftwareKeyboard::InitializeFrontendInlineKeyboardOld() { .sub_text{}, .guide_text{}, .initial_text{current_text}, + .left_optional_symbol_key{appear_arg.left_optional_symbol_key}, + .right_optional_symbol_key{appear_arg.right_optional_symbol_key}, .max_text_length{max_text_length}, .min_text_length{min_text_length}, .initial_cursor_position{initial_cursor_position}, @@ -632,6 +636,8 @@ void SoftwareKeyboard::InitializeFrontendInlineKeyboardNew() { .sub_text{}, .guide_text{}, .initial_text{current_text}, + .left_optional_symbol_key{appear_arg.left_optional_symbol_key}, + .right_optional_symbol_key{appear_arg.right_optional_symbol_key}, .max_text_length{max_text_length}, .min_text_length{min_text_length}, .initial_cursor_position{initial_cursor_position}, |