Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-28 09:30:56 +01:00
Code Releases Wiki Activity

IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces.

Browse Source
This commit is contained in:
omar 2017-09-27 23:10:46 +02:00
parent 7bcb1d3816
commit c5a79deb38
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
imgui.cpp
View File

@ -1954,12 +1954,14 @@ bool ImGui::ItemAdd(const ImRect& bb, const ImGuiID* id)
bool ImGui::IsItemHovered() bool ImGui::IsItemHovered()
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow; ImGuiWindow* window = g.CurrentWindow;
if (g.HoveredWindow == window) if (g.HoveredWindow != window)
if (g.ActiveId == 0 || g.ActiveId == window->DC.LastItemId || g.ActiveIdAllowOverlap || g.ActiveId == window->MoveId) return false;
if (IsMouseHoveringRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max)) if (g.ActiveId == 0 || g.ActiveId == window->DC.LastItemId || g.ActiveIdAllowOverlap || g.ActiveId == window->MoveId)
if (IsWindowContentHoverable(window)) if (IsMouseHoveringRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max))
return true; if (IsWindowContentHoverable(window))
return true;
return false; return false;
} }
@ -1974,15 +1976,17 @@ bool ImGui::IsItemRectHovered()
bool ImGui::IsHovered(const ImRect& bb, ImGuiID id) bool ImGui::IsHovered(const ImRect& bb, ImGuiID id)
{ {
ImGuiContext& g = *GImGui; 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) ImGuiWindow* window = g.CurrentWindow;
if (g.ActiveId == 0 || g.ActiveId == id || g.ActiveIdAllowOverlap) if (g.HoveredWindow != window)
if (IsMouseHoveringRect(bb.Min, bb.Max)) return false;
if (IsWindowContentHoverable(g.HoveredRootWindow)) if (g.ActiveId == 0 || g.ActiveId == id || g.ActiveIdAllowOverlap)
return true; if (IsMouseHoveringRect(bb.Min, bb.Max))
} if (IsWindowContentHoverable(g.HoveredRootWindow))
return true;
return false; return false;
} }