IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() (#1382, #1404)

This commit is contained in:
omar 2017-11-02 16:23:03 +01:00
parent 1e7cc23867
commit 803ac3a5c6
1 changed files with 2 additions and 2 deletions

View File

@ -5115,7 +5115,7 @@ bool ImGui::IsWindowHovered(ImGuiHoveredFlags flags)
if (!IsWindowContentHoverable(g.HoveredRootWindow, flags))
return false;
if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem))
if (g.ActiveId != 0 && g.ActiveIdWindow != g.CurrentWindow)
if (g.ActiveId != 0 && !g.ActiveIdAllowOverlap)
return false;
return true;
}
@ -5151,7 +5151,7 @@ bool ImGui::IsRootWindowOrAnyChildHovered(ImGuiHoveredFlags flags)
if (!IsWindowContentHoverable(g.HoveredRootWindow, flags))
return false;
if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem))
if (g.ActiveId != 0 && g.ActiveIdWindow != g.CurrentWindow)
if (g.ActiveId != 0 && !g.ActiveIdAllowOverlap)
return false;
return true;
}