@ -9777,8 +9777,9 @@ static void ImGui::NavUpdateWindowing()
}
// Start CTRL-TAB or Square+L/R window selection
bool start_windowing_with_gamepad = allow_windowing & & ! g . NavWindowingTarget & & IsNavInputTest ( ImGuiNavInput_Menu , ImGuiInputReadMode_Pressed ) ;
bool start_windowing_with_keyboard = allow_windowing & & ! g . NavWindowingTarget & & io . KeyCtrl & & IsKeyPressedMap ( ImGuiKey_Tab ) & & ( io . ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard ) ;
const bool nav_keyboard_active = ( io . ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard ) ! = 0 ;
const bool start_windowing_with_gamepad = allow_windowing & & ! g . NavWindowingTarget & & IsNavInputTest ( ImGuiNavInput_Menu , ImGuiInputReadMode_Pressed ) ;
const bool start_windowing_with_keyboard = allow_windowing & & ! g . NavWindowingTarget & & nav_keyboard_active & & io . KeyCtrl & & IsKeyPressedMap ( ImGuiKey_Tab ) ;
if ( start_windowing_with_gamepad | | start_windowing_with_keyboard )
if ( ImGuiWindow * window = g . NavWindow ? g . NavWindow : FindWindowNavFocusable ( g . WindowsFocusOrder . Size - 1 , - INT_MAX , - 1 ) )
{
@ -9829,7 +9830,7 @@ static void ImGui::NavUpdateWindowing()
// Keyboard: Press and Release ALT to toggle menu layer
// - Testing that only Alt is tested prevents Alt+Shift or AltGR from toggling menu layer.
// - AltGR is normally Alt+Ctrl but we can't reliably detect it (not all backends/systems/layout emit it as Alt+Ctrl). But even on keyboards without AltGR we don't want Alt+Ctrl to open menu anyway.
if ( io. KeyMods = = ImGuiKeyModFlags_Alt & & ( io . KeyModsPrev & ImGuiKeyModFlags_Alt ) = = 0 )
if ( nav_keyboard_active & & io. KeyMods = = ImGuiKeyModFlags_Alt & & ( io . KeyModsPrev & ImGuiKeyModFlags_Alt ) = = 0 )
{
g . NavWindowingToggleLayer = true ;
g . NavInputSource = ImGuiInputSource_Keyboard ;