Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-28 17:40:56 +01:00
Code Releases Wiki Activity

Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. (#787)

Browse Source
This commit is contained in:
omar 2018-01-29 22:51:28 +01:00
parent c8d8dc7f0a
commit 020b153d35
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgui.cpp
View File

@ -7839,12 +7839,12 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Left && is_open) if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Left && is_open)
{ {
toggled = true; toggled = true;
g.NavMoveRequest = false; NavMoveRequestCancel();
} }
if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right && !is_open) // If there's something upcoming on the line we may want to give it the priority? if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right && !is_open) // If there's something upcoming on the line we may want to give it the priority?
{ {
toggled = true; toggled = true;
g.NavMoveRequest = false; NavMoveRequestCancel();
} }
if (toggled) if (toggled)
@ -10976,7 +10976,7 @@ bool ImGui::BeginMenu(const char* label, bool enabled)
if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right) // Nav-Right to open if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right) // Nav-Right to open
{ {
want_open = true; want_open = true;
g.NavMoveRequest = false; NavMoveRequestCancel();
} }
} }
else else
@ -10993,8 +10993,8 @@ bool ImGui::BeginMenu(const char* label, bool enabled)
} }
else if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Down) // Nav-Down to open else if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Down) // Nav-Down to open
{ {
g.NavMoveRequest = false;
want_open = true; want_open = true;
NavMoveRequestCancel();
} }
} }
@ -11032,7 +11032,7 @@ void ImGui::EndMenu()
if (g.NavWindow && g.NavWindow->ParentWindow == window && g.NavMoveRequest && g.NavMoveResult.ID == 0 && g.NavMoveDir == ImGuiDir_Left && window->DC.LayoutType == ImGuiLayoutType_Vertical) if (g.NavWindow && g.NavWindow->ParentWindow == window && g.NavMoveRequest && g.NavMoveResult.ID == 0 && g.NavMoveDir == ImGuiDir_Left && window->DC.LayoutType == ImGuiLayoutType_Vertical)
{ {
ClosePopupToLevel(g.OpenPopupStack.Size - 1); ClosePopupToLevel(g.OpenPopupStack.Size - 1);
g.NavMoveRequest = false; NavMoveRequestCancel();
} }
EndPopup(); EndPopup();