diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-06 17:26:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-06 17:26:53 +0100 |
commit | d8534ea140a0e07fa010fe58fae068ed926c1dbc (patch) | |
tree | 176afc9e7d481b7b48f5a61a21b5184bf33cef62 /src/core/frontend/applets/software_keyboard.h | |
parent | Merge pull request #9389 from lioncash/emumove (diff) | |
parent | applets/controller: Use aliases for callbacks (diff) | |
download | yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.tar yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.tar.gz yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.tar.bz2 yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.tar.lz yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.tar.xz yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.tar.zst yuzu-d8534ea140a0e07fa010fe58fae068ed926c1dbc.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/frontend/applets/software_keyboard.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index 094d1e713..8aef103d3 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/src/core/frontend/applets/software_keyboard.h @@ -54,14 +54,17 @@ struct InlineTextParameters { class SoftwareKeyboardApplet { public: + using SubmitInlineCallback = + std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>; + using SubmitNormalCallback = + std::function<void(Service::AM::Applets::SwkbdResult, std::u16string, bool)>; + virtual ~SoftwareKeyboardApplet(); - virtual void InitializeKeyboard( - bool is_inline, KeyboardInitializeParameters initialize_parameters, - std::function<void(Service::AM::Applets::SwkbdResult, std::u16string, bool)> - submit_normal_callback_, - std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)> - submit_inline_callback_) = 0; + virtual void InitializeKeyboard(bool is_inline, + KeyboardInitializeParameters initialize_parameters, + SubmitNormalCallback submit_normal_callback_, + SubmitInlineCallback submit_inline_callback_) = 0; virtual void ShowNormalKeyboard() const = 0; @@ -81,12 +84,9 @@ class DefaultSoftwareKeyboardApplet final : public SoftwareKeyboardApplet { public: ~DefaultSoftwareKeyboardApplet() override; - void InitializeKeyboard( - bool is_inline, KeyboardInitializeParameters initialize_parameters, - std::function<void(Service::AM::Applets::SwkbdResult, std::u16string, bool)> - submit_normal_callback_, - std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)> - submit_inline_callback_) override; + void InitializeKeyboard(bool is_inline, KeyboardInitializeParameters initialize_parameters, + SubmitNormalCallback submit_normal_callback_, + SubmitInlineCallback submit_inline_callback_) override; void ShowNormalKeyboard() const override; @@ -105,12 +105,10 @@ private: void SubmitNormalText(std::u16string text) const; void SubmitInlineText(std::u16string_view text) const; - KeyboardInitializeParameters parameters; + KeyboardInitializeParameters parameters{}; - mutable std::function<void(Service::AM::Applets::SwkbdResult, std::u16string, bool)> - submit_normal_callback; - mutable std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)> - submit_inline_callback; + mutable SubmitNormalCallback submit_normal_callback; + mutable SubmitInlineCallback submit_inline_callback; }; } // namespace Core::Frontend |