Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-26 05:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces.

Browse Source
This commit is contained in:
omar 2017-09-28 00:05:18 +02:00
parent 2b7d4c713e
commit eca74d55c7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
imgui.cpp
View File

@ -1970,12 +1970,13 @@ bool ImGui::IsItemHovered()
ImGuiWindow* window = g.CurrentWindow; ImGuiWindow* window = g.CurrentWindow;
if (g.HoveredWindow != window) if (g.HoveredWindow != window)
return false; return false;
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)) return false;
if (IsWindowContentHoverable(window)) if (!IsMouseHoveringRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max))
return true; return false;
if (!IsWindowContentHoverable(window))
return false; return false;
return true;
} }
bool ImGui::IsItemRectHovered() bool ImGui::IsItemRectHovered()
@ -1994,12 +1995,13 @@ bool ImGui::IsHovered(const ImRect& bb, ImGuiID id)
ImGuiWindow* window = g.CurrentWindow; ImGuiWindow* window = g.CurrentWindow;
if (g.HoveredWindow != window) if (g.HoveredWindow != window)
return false; return false;
if (g.ActiveId == 0 || g.ActiveId == id || g.ActiveIdAllowOverlap) if (g.ActiveId != 0 && g.ActiveId != id && !g.ActiveIdAllowOverlap)
if (IsMouseHoveringRect(bb.Min, bb.Max)) return false;
if (IsWindowContentHoverable(g.HoveredRootWindow)) if (!IsMouseHoveringRect(bb.Min, bb.Max))
return true; return false;
if (!IsWindowContentHoverable(g.HoveredRootWindow))
return false; return false;
return true;
} }
bool ImGui::IsClippedEx(const ImRect& bb, const ImGuiID* id, bool clip_even_when_logged) bool ImGui::IsClippedEx(const ImRect& bb, const ImGuiID* id, bool clip_even_when_logged)