1
0
mirror of https://github.com/ocornut/imgui.git synced 2025-02-06 14:24:29 +01:00

Nav: Fixed merge cc26db8ec7f87a21b705fa9821a3c9f76003c7e5

This commit is contained in:
omar 2017-09-27 17:27:21 +02:00
parent cc26db8ec7
commit 79ef64430c

View File

@ -2226,7 +2226,7 @@ bool ImGui::IsItemHovered()
if (g.HoveredWindow == window) if (g.HoveredWindow == window)
if (g.ActiveId == 0 || g.ActiveId == window->DC.LastItemId || g.ActiveIdAllowOverlap || g.ActiveId == window->MoveId) if (g.ActiveId == 0 || g.ActiveId == window->DC.LastItemId || g.ActiveIdAllowOverlap || g.ActiveId == window->MoveId)
if (IsMouseHoveringRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max)) if (IsMouseHoveringRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max))
if (IsWindowContentHoverable(window)) if (!g.NavDisableMouseHover && IsWindowContentHoverable(window))
return true; return true;
return false; return false;