From 1ad9ca7e904a19f342e8bd3e9a7f22c5d9cf25cb Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 1 Jun 2025 14:35:58 +1000 Subject: [PATCH] FullscreenUI: Cancel pending nav on focus reset --- src/util/imgui_fullscreen.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp index 452d08b92..223927895 100644 --- a/src/util/imgui_fullscreen.cpp +++ b/src/util/imgui_fullscreen.cpp @@ -833,6 +833,13 @@ void ImGuiFullscreen::QueueResetFocus(FocusResetType type) s_state.focus_reset_queued = type; s_state.close_button_state = (s_state.close_button_state != CloseButtonState::Cancelled) ? CloseButtonState::None : CloseButtonState::Cancelled; + + GImGui->NavMoveSubmitted = false; + GImGui->NavMoveDir = ImGuiDir_None; + GImGui->NavMoveFlags = ImGuiNavMoveFlags_None; + GImGui->NavMoveScrollFlags = ImGuiScrollFlags_None; + GImGui->NavMoveClipDir = GImGui->NavMoveDir; + GImGui->NavScoringNoClipRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX); } bool ImGuiFullscreen::ResetFocusHere()