FullscreenUI: Cancel pending nav on focus reset

6 months ago · 1ad9ca7e90
parent 9d59763bad
commit 1ad9ca7e90
1 changed files with 7 additions and 0 deletions
--- 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()