summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-11-10 02:38:11 +0100
committerZach Hilman <zachhilman@gmail.com>2018-11-18 16:53:47 +0100
commita81645400f9ba40b272163ef6f751ba3428b85a1 (patch)
treed552327edfbcd8a37321a0cfb2520c37c7cd4869
parentam: Construct and use proper applets with ILibraryAppletAccessor (diff)
downloadyuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.gz
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.bz2
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.lz
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.xz
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.zst
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.zip
-rw-r--r--src/core/frontend/applets/software_keyboard.cpp1
-rw-r--r--src/yuzu/applets/software_keyboard.cpp1
-rw-r--r--src/yuzu/main.cpp4
3 files changed, 6 insertions, 0 deletions
diff --git a/src/core/frontend/applets/software_keyboard.cpp b/src/core/frontend/applets/software_keyboard.cpp
index 8cb888a62..c1bacefef 100644
--- a/src/core/frontend/applets/software_keyboard.cpp
+++ b/src/core/frontend/applets/software_keyboard.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "common/logging/backend.h"
+#include "common/string_util.h"
#include "core/frontend/applets/software_keyboard.h"
namespace Frontend {
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp
index 9e1c59626..bd8bd0dd0 100644
--- a/src/yuzu/applets/software_keyboard.cpp
+++ b/src/yuzu/applets/software_keyboard.cpp
@@ -9,6 +9,7 @@
#include <QLineEdit>
#include <QVBoxLayout>
#include "common/logging/backend.h"
+#include "common/string_util.h"
#include "yuzu/applets/software_keyboard.h"
QtSoftwareKeyboardValidator::QtSoftwareKeyboardValidator(
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 999086e7f..7b2a01169 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -8,9 +8,11 @@
#include <thread>
// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
+#include "applets/software_keyboard.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_real.h"
#include "core/hle/service/acc/profile_manager.h"
+#include "core/hle/service/am/applets/applets.h"
// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows
// defines.
@@ -559,6 +561,8 @@ bool GMainWindow::LoadROM(const QString& filename) {
system.SetGPUDebugContext(debug_context);
+ Service::AM::Applets::RegisterSoftwareKeyboard(std::make_shared<QtSoftwareKeyboard>(*this));
+
const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
const auto drd_callout =