Skip to content

Commit

Permalink
ItemAdd(): re-ordering the tests, submission should now be faster.
Browse files Browse the repository at this point in the history
  • Loading branch information
ocornut committed Sep 27, 2017
1 parent 99c7622 commit c075786
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions imgui.cpp
Original file line number Diff line number Diff line change
@@ -1947,13 +1947,13 @@ bool ImGui::ItemAdd(const ImRect& bb, const ImGuiID* id)
return false;
//if (g.IO.KeyAlt) window->DrawList->AddRect(bb.Min, bb.Max, IM_COL32(255,255,0,120)); // [DEBUG]

// Setting LastItemHoveredAndUsable for public facing IsItemHovered(). This is a sensible default, but widgets are free to override it.
// Set up for public-facing IsItemHovered(). We store the result in DC.LastItemHoveredAndUsable.
// This is roughly matching the behavior of internal IsHovered()
// - we allow hovering to be true when ActiveId==window->MoveID, so that clicking on non-interactive items such as a Text() item still returns true with IsItemHovered())
// FIXME-OPT: Consider moving this code to IsItemHovered() so it's only evaluated if users needs it.
if (IsMouseHoveringRect(bb.Min, bb.Max))
if (g.HoveredRootWindow == window->RootWindow)
{
// Matching the behavior of internal IsHovered() but:
// - we allow hovering to be true when ActiveId==window->MoveID, so that clicking on non-interactive items such as a Text() item still returns true with IsItemHovered())
if (g.HoveredRootWindow == window->RootWindow)
if (IsMouseHoveringRect(bb.Min, bb.Max))
if (g.ActiveId == 0 || (id && g.ActiveId == *id) || g.ActiveIdAllowOverlap || (g.ActiveId == window->MoveId))
if (IsWindowContentHoverable(window))
window->DC.LastItemHoveredAndUsable = true;

0 comments on commit c075786

Please sign in to comment.