Menus: amend to clarify/fix static analyzer warning. (#6671, #6926)

This commit is contained in:
ocornut 2023-11-29 17:08:06 +01:00
parent 2ee40d3cf9
commit b112d73edb

View File

@ -7536,11 +7536,12 @@ bool ImGui::BeginMenuEx(const char* label, const char* icon, bool enabled)
want_close = true; want_close = true;
// Open // Open
// (note: at this point 'hovered' actually includes the NavDisableMouseHover == false test)
if (!menu_is_open && pressed) // Click/activate to open if (!menu_is_open && pressed) // Click/activate to open
want_open = true; want_open = true;
else if (!menu_is_open && hovered && !moving_toward_child_menu) // Hover to open else if (!menu_is_open && hovered && !moving_toward_child_menu) // Hover to open
want_open = true; want_open = true;
else if (!menu_is_open && hovered && !g.NavDisableMouseHover && g.HoveredIdTimer >= 0.30f && g.MouseStationaryTimer >= 0.30f) // Hover to open (timer fallback) else if (!menu_is_open && hovered && g.HoveredIdTimer >= 0.30f && g.MouseStationaryTimer >= 0.30f) // Hover to open (timer fallback)
want_open = true; want_open = true;
if (g.NavId == id && g.NavMoveDir == ImGuiDir_Right) // Nav-Right to open if (g.NavId == id && g.NavMoveDir == ImGuiDir_Right) // Nav-Right to open
{ {