mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-24 02:14:22 +00:00
Code Activity

Nav: Fixed inability to cancel nav in modal popups. (#5400)

Browse source
This commit is contained in:
Rokas Kupstys 2022-06-17 11:14:16 +03:00 • committed by ocornut
parent 07efd7cc20
commit 37a07858a9
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
imgui.cpp
View file

@ -10630,11 +10630,10 @@ static void ImGui::NavUpdateCancelRequest()
SetNavID(child_window->ChildId, ImGuiNavLayer_Main, 0, WindowRectAbsToRel(parent_window, child_rect));
NavRestoreHighlightAfterMove();
}
else if (g.OpenPopupStack.Size > 0)
else if (g.OpenPopupStack.Size > 0 && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
{
// Close open popup/menu
if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
}
else
{