mirrors/imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP Menus: Closing sub-menu when hovering something else in the same parent window (#126)

Browse Source 
Immediate open/close is error-prone
This commit is contained in:
ocornut 2015-05-26 15:01:04 +01:00
parent 83b10f77a9
commit 4eeba016f6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
imgui.cpp
View File

@ -7603,15 +7603,17 @@ bool ImGui::BeginMenu(const char* label)
bool want_open = false;
if (window->Flags & (ImGuiWindowFlags_Popup|ImGuiWindowFlags_ChildMenu))
want_open = (!opened && hovered);
else if (opened && pressed && menuset_opened)
{
ClosePopup(label); // click again to toggle
if (opened && !hovered && g.HoveredWindow == window && g.HoveredIdPreviousFrame != 0 && g.HoveredIdPreviousFrame != id)
ClosePopup(label);
want_open = (!opened && hovered);
}
else if (opened && pressed && menuset_opened) // menu-bar: click open menu to close
{
ClosePopup(label);
want_open = opened = false;
}
else if (pressed)
want_open = true;
else if (hovered && menuset_opened && !opened)
else if (pressed || (hovered && menuset_opened && !opened)) // menu-bar: first click to open, then hover to open others
want_open = true;
if (!opened && want_open && g.OpenedPopupStack.size() > g.CurrentPopupStack.size())