summaryrefslogtreecommitdiff
path: root/src/yuzu/applets/software_keyboard.h
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-11-12 11:08:09 -0500
committerZach Hilman <zachhilman@gmail.com>2018-11-18 10:53:47 -0500
commit8b433beff34c382e50334bb59c4f71394845558c (patch)
treef52f432b2ee5f4ef3917c1c0e2fa052930d68f3a /src/yuzu/applets/software_keyboard.h
parent7cfb29de23836aa1873bbb108e3d25a0e9dcfa6d (diff)
software_keyboard: Make GetText asynchronous
a
Diffstat (limited to 'src/yuzu/applets/software_keyboard.h')
-rw-r--r--src/yuzu/applets/software_keyboard.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/software_keyboard.h
index 8d95ca511f..670b05dc98 100644
--- a/src/yuzu/applets/software_keyboard.h
+++ b/src/yuzu/applets/software_keyboard.h
@@ -54,14 +54,23 @@ private:
};
class QtSoftwareKeyboard final : public QObject, public Core::Frontend::SoftwareKeyboardApplet {
+ Q_OBJECT
+
public:
explicit QtSoftwareKeyboard(GMainWindow& parent);
~QtSoftwareKeyboard() override;
- std::optional<std::u16string> GetText(
- Core::Frontend::SoftwareKeyboardParameters parameters) const override;
+ void RequestText(std::function<void(std::optional<std::u16string>)> out,
+ Core::Frontend::SoftwareKeyboardParameters parameters) const override;
void SendTextCheckDialog(std::u16string error_message) const override;
+signals:
+ void MainWindowGetText(Core::Frontend::SoftwareKeyboardParameters parameters) const;
+ void MainWindowTextCheckDialog(std::u16string error_message) const;
+
+public slots:
+ void MainWindowFinishedText(std::optional<std::u16string> text);
+
private:
- GMainWindow& main_window;
+ mutable std::function<void(std::optional<std::u16string>)> text_output;
};