From 1b2b443a03ad33bd97e4960dfac3f73b461b2bd3 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 29 May 2022 11:16:15 -0700 Subject: [PATCH 1/2] UI: Abandon focus movement on returning from pause. See #15530. --- UI/EmuScreen.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index b2a32c45ec..385be99444 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -414,6 +414,9 @@ void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) { System_SendMessage("event", "exitgame"); quit_ = false; } + // Returning to the PauseScreen, unless we're stepping, means we should go back to controls. + if (Core_IsActive()) + UI::EnableFocusMovement(false); RecreateViews(); } From df4017baba6908f033af13dbb3d0011bc081e652 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 29 May 2022 11:16:56 -0700 Subject: [PATCH 2/2] Osk: Fix fullscreen check. See previous 21bf41e, failed to add this change because of UTF-16. --- Core/Dialog/PSPOskDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 4188b50748..c243e78a6b 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -943,7 +943,7 @@ int PSPOskDialog::Update(int animSpeed) { // 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)) { - if (g_Config.bBypassOSKWithKeyboard && !g_Config.bFullScreen) + if (g_Config.bBypassOSKWithKeyboard && !g_Config.UseFullScreen()) return NativeKeyboard(); } #endif