From 3d0051f34b96fc00e7e6712c6b73f82e2194bbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 29 Jun 2023 13:27:49 +0200 Subject: [PATCH] Fix enabling of native keyboard input on Switch --- Core/Config.cpp | 2 +- Core/Dialog/PSPOskDialog.cpp | 2 +- SDL/SDLMain.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 33c8d9ac82..90c70cddb6 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -840,7 +840,7 @@ static const ConfigSetting systemParamSettings[] = { ConfigSetting("ButtonPreference", &g_Config.iButtonPreference, PSP_SYSTEMPARAM_BUTTON_CROSS, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("LockParentalLevel", &g_Config.iLockParentalLevel, 0, CfgFlag::PER_GAME), ConfigSetting("WlanAdhocChannel", &g_Config.iWlanAdhocChannel, PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC, CfgFlag::PER_GAME), -#if defined(USING_WIN_UI) || defined(USING_QT_UI) || PPSSPP_PLATFORM(ANDROID) +#if defined(USING_WIN_UI) || defined(USING_QT_UI) || PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) ConfigSetting("BypassOSKWithKeyboard", &g_Config.bBypassOSKWithKeyboard, false, CfgFlag::PER_GAME), #endif ConfigSetting("WlanPowerSave", &g_Config.bWlanPowerSave, (bool) PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF, CfgFlag::PER_GAME), diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 7e07dd2b91..555d638320 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -975,7 +975,7 @@ int PSPOskDialog::Update(int animSpeed) { int selectedRow = selectedChar / numKeyCols[currentKeyboard]; int selectedExtra = selectedChar % numKeyCols[currentKeyboard]; -#if defined(USING_WIN_UI) || defined(USING_QT_UI) || PPSSPP_PLATFORM(ANDROID) +#if defined(USING_WIN_UI) || defined(USING_QT_UI) || PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) // Windows: Fall back to the OSK/continue normally if we're in fullscreen. // The dialog box doesn't work right if in fullscreen. if (System_GetPropertyBool(SYSPROP_HAS_KEYBOARD)) { diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 6d19a66171..a9d7bb1bd8 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -564,6 +564,8 @@ bool System_GetPropertyBool(SystemProperty prop) { #if PPSSPP_PLATFORM(SWITCH) case SYSPROP_HAS_TEXT_INPUT_DIALOG: return __nx_applet_type == AppletType_Application || __nx_applet_type != AppletType_SystemApplication; + case SYSPROP_HAS_KEYBOARD: + return true; #endif case SYSPROP_APP_GOLD: #ifdef GOLD