@@ -4356,7 +4356,7 @@ void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window)
4356
4356
4357
4357
// This could be written in a more general way (e.g associate a hook to ActiveId),
4358
4358
// but since this is currently quite an exception we'll leave it as is.
4359
- // One common scenario leading to this is: pressing Key ->NavMoveRequestApplyResult() -> ClearActiveId ()
4359
+ // One common scenario leading to this is: pressing Key ->NavMoveRequestApplyResult() -> ClearActiveID ()
4360
4360
if (g.InputTextState.ID == g.ActiveId)
4361
4361
InputTextDeactivateHook(g.ActiveId);
4362
4362
}
@@ -13625,15 +13625,16 @@ static void ImGui::NavUpdateWindowing()
13625
13625
// Keyboard: Press and Release ALT to toggle menu layer
13626
13626
const ImGuiKey windowing_toggle_keys[] = { ImGuiKey_LeftAlt, ImGuiKey_RightAlt };
13627
13627
bool windowing_toggle_layer_start = false;
13628
- for (ImGuiKey windowing_toggle_key : windowing_toggle_keys)
13629
- if (nav_keyboard_active && IsKeyPressed(windowing_toggle_key, 0, ImGuiKeyOwner_NoOwner))
13630
- {
13631
- windowing_toggle_layer_start = true;
13632
- g.NavWindowingToggleLayer = true;
13633
- g.NavWindowingToggleKey = windowing_toggle_key;
13634
- g.NavInputSource = ImGuiInputSource_Keyboard;
13635
- break;
13636
- }
13628
+ if (g.NavWindow != NULL && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
13629
+ for (ImGuiKey windowing_toggle_key : windowing_toggle_keys)
13630
+ if (nav_keyboard_active && IsKeyPressed(windowing_toggle_key, 0, ImGuiKeyOwner_NoOwner))
13631
+ {
13632
+ windowing_toggle_layer_start = true;
13633
+ g.NavWindowingToggleLayer = true;
13634
+ g.NavWindowingToggleKey = windowing_toggle_key;
13635
+ g.NavInputSource = ImGuiInputSource_Keyboard;
13636
+ break;
13637
+ }
13637
13638
if (g.NavWindowingToggleLayer && g.NavInputSource == ImGuiInputSource_Keyboard)
13638
13639
{
13639
13640
// We cancel toggling nav layer when any text has been typed (generally while holding Alt). (See #370)
0 commit comments