mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-12-26 21:00:07 +00:00
qt/main: Register Qt Software Keyboard frontend with AM
Allows using Qt provider over default.
This commit is contained in:
parent
48fcb43585
commit
a81645400f
@ -3,6 +3,7 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "common/logging/backend.h"
|
#include "common/logging/backend.h"
|
||||||
|
#include "common/string_util.h"
|
||||||
#include "core/frontend/applets/software_keyboard.h"
|
#include "core/frontend/applets/software_keyboard.h"
|
||||||
|
|
||||||
namespace Frontend {
|
namespace Frontend {
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include "common/logging/backend.h"
|
#include "common/logging/backend.h"
|
||||||
|
#include "common/string_util.h"
|
||||||
#include "yuzu/applets/software_keyboard.h"
|
#include "yuzu/applets/software_keyboard.h"
|
||||||
|
|
||||||
QtSoftwareKeyboardValidator::QtSoftwareKeyboardValidator(
|
QtSoftwareKeyboardValidator::QtSoftwareKeyboardValidator(
|
||||||
|
@ -8,9 +8,11 @@
|
|||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
|
// 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.h"
|
||||||
#include "core/file_sys/vfs_real.h"
|
#include "core/file_sys/vfs_real.h"
|
||||||
#include "core/hle/service/acc/profile_manager.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
|
// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows
|
||||||
// defines.
|
// defines.
|
||||||
@ -559,6 +561,8 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
|||||||
|
|
||||||
system.SetGPUDebugContext(debug_context);
|
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 Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
|
||||||
|
|
||||||
const auto drd_callout =
|
const auto drd_callout =
|
||||||
|
Loading…
Reference in New Issue
Block a user