mirror of
https://github.com/ocornut/imgui.git
synced 2025-02-17 19:09:27 +01:00
Fix merge issue on master.
This commit is contained in:
parent
ae76a1fda7
commit
ca953f0fee
@ -7374,7 +7374,7 @@ static void ImGui::NavUpdate()
|
|||||||
{
|
{
|
||||||
// Close open popup/menu
|
// Close open popup/menu
|
||||||
if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
|
if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
|
||||||
ClosePopupToLevel(g.OpenPopupStack.Size - 1);
|
ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
|
||||||
}
|
}
|
||||||
else if (g.NavLayer != 0)
|
else if (g.NavLayer != 0)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user