From a83ccdcd0edd7bbbc8d31d0d82c52ed7743e25b8 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 12 Jan 2026 17:14:49 +1000 Subject: [PATCH] FullscreenUI: Fix focusing when pressing west face button --- dep/imgui/src/imgui.cpp | 2 +- src/core/fullscreenui_widgets.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dep/imgui/src/imgui.cpp b/dep/imgui/src/imgui.cpp index 5cd4d8ec8..05b9be200 100644 --- a/dep/imgui/src/imgui.cpp +++ b/dep/imgui/src/imgui.cpp @@ -14466,7 +14466,7 @@ static void ImGui::NavUpdateWindowing() const bool nav_keyboard_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; const bool keyboard_next_window = allow_windowing && g.ConfigNavWindowingKeyNext && Shortcut(g.ConfigNavWindowingKeyNext, ImGuiInputFlags_Repeat | ImGuiInputFlags_RouteAlways, owner_id); const bool keyboard_prev_window = allow_windowing && g.ConfigNavWindowingKeyPrev && Shortcut(g.ConfigNavWindowingKeyPrev, ImGuiInputFlags_Repeat | ImGuiInputFlags_RouteAlways, owner_id); - const bool start_toggling_with_gamepad = nav_gamepad_active && !g.NavWindowingTarget && Shortcut(ImGuiKey_NavGamepadMenu, ImGuiInputFlags_RouteAlways, owner_id); + const bool start_toggling_with_gamepad = false;// nav_gamepad_active && !g.NavWindowingTarget && Shortcut(ImGuiKey_NavGamepadMenu, ImGuiInputFlags_RouteAlways, owner_id); const bool start_windowing_with_gamepad = allow_windowing && start_toggling_with_gamepad; const bool start_windowing_with_keyboard = allow_windowing && !g.NavWindowingTarget && (keyboard_next_window || keyboard_prev_window); // Note: enabled even without NavEnableKeyboard! bool just_started_windowing_from_null_focus = false; diff --git a/src/core/fullscreenui_widgets.cpp b/src/core/fullscreenui_widgets.cpp index d3649ece5..5cf108824 100644 --- a/src/core/fullscreenui_widgets.cpp +++ b/src/core/fullscreenui_widgets.cpp @@ -1404,8 +1404,8 @@ bool FullscreenUI::BeginFullscreenColumnWindow(float start, float end, const cha ImGui::SetCursorPos(pos); return ImGui::BeginChild(name, size, - (padding.x != 0.0f || padding.y != 0.0f) ? ImGuiChildFlags_AlwaysUseWindowPadding : 0, - ImGuiChildFlags_NavFlattened); + ((padding.x != 0.0f || padding.y != 0.0f) ? ImGuiChildFlags_AlwaysUseWindowPadding : 0) | + ImGuiChildFlags_NavFlattened | ImGuiChildFlags_NoNavCancel); } void FullscreenUI::EndFullscreenColumnWindow()