mirror of
https://github.com/Drezil/imgui.git
synced 2024-12-24 16:46:36 +00:00
IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces.
This commit is contained in:
parent
7bcb1d3816
commit
c5a79deb38
14
imgui.cpp
14
imgui.cpp
@ -1954,8 +1954,10 @@ bool ImGui::ItemAdd(const ImRect& bb, const ImGuiID* id)
|
||||
bool ImGui::IsItemHovered()
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
|
||||
ImGuiWindow* window = g.CurrentWindow;
|
||||
if (g.HoveredWindow == window)
|
||||
if (g.HoveredWindow != window)
|
||||
return false;
|
||||
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 (IsWindowContentHoverable(window))
|
||||
@ -1974,15 +1976,17 @@ bool ImGui::IsItemRectHovered()
|
||||
bool ImGui::IsHovered(const ImRect& bb, ImGuiID id)
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
if (g.HoveredId == 0 || g.HoveredId == id || g.HoveredIdAllowOverlap)
|
||||
{
|
||||
if (g.HoveredId != 0 && g.HoveredId != id && !g.HoveredIdAllowOverlap)
|
||||
return false;
|
||||
|
||||
ImGuiWindow* window = g.CurrentWindow;
|
||||
if (g.HoveredWindow == window)
|
||||
if (g.HoveredWindow != window)
|
||||
return false;
|
||||
if (g.ActiveId == 0 || g.ActiveId == id || g.ActiveIdAllowOverlap)
|
||||
if (IsMouseHoveringRect(bb.Min, bb.Max))
|
||||
if (IsWindowContentHoverable(g.HoveredRootWindow))
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user