Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-03-28 23:12:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hovering bug introduced in ac2da570 when popup is inactive #126

Browse Source
This commit is contained in:
ocornut 2015-03-26 17:35:52 +00:00
parent 5fe4ae62cb
commit a4dc775339
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -1221,6 +1221,7 @@ struct ImGuiWindow
float NextScrollY; float NextScrollY;
bool ScrollbarY; bool ScrollbarY;
bool Visible; // Set to true on Begin() bool Visible; // Set to true on Begin()
bool WasVisible;
bool Accessed; // Set to true when any widget access the current window bool Accessed; // Set to true when any widget access the current window
bool Collapsed; // Set when collapsing window to become only title-bar bool Collapsed; // Set when collapsing window to become only title-bar
bool SkipItems; // == Visible && !Collapsed bool SkipItems; // == Visible && !Collapsed
@ -1562,7 +1563,7 @@ ImGuiWindow::ImGuiWindow(const char* name)
ScrollY = 0.0f; ScrollY = 0.0f;
NextScrollY = 0.0f; NextScrollY = 0.0f;
ScrollbarY = false; ScrollbarY = false;
Visible = false; Visible = WasVisible = false;
Accessed = false; Accessed = false;
Collapsed = false; Collapsed = false;
SkipItems = false; SkipItems = false;
@ -1990,6 +1991,7 @@ void ImGui::NewFrame()
for (size_t i = 0; i != g.Windows.size(); i++) for (size_t i = 0; i != g.Windows.size(); i++)
{ {
ImGuiWindow* window = g.Windows[i]; ImGuiWindow* window = g.Windows[i];
window->WasVisible = window->Visible;
window->Visible = false; window->Visible = false;
window->Accessed = false; window->Accessed = false;
} }
@ -4246,7 +4248,7 @@ static bool IsHovered(const ImRect& bb, ImGuiID id)
{ {
if ((g.ActiveId == 0 || g.ActiveId == id || g.ActiveIdIsFocusedOnly) && IsMouseHoveringRect(bb)) if ((g.ActiveId == 0 || g.ActiveId == id || g.ActiveIdIsFocusedOnly) && IsMouseHoveringRect(bb))
{ {
if (!(g.FocusedWindow->Flags & ImGuiWindowFlags_Popup) || g.FocusedWindow == g.HoveredRootWindow) if (g.FocusedWindow == g.HoveredRootWindow || !((g.FocusedWindow->Flags & ImGuiWindowFlags_Popup) != 0 && g.FocusedWindow->WasVisible))
{ {
return true; return true;
} }
@ -7006,7 +7008,7 @@ static bool ItemAdd(const ImRect& bb, const ImGuiID* id)
window->DC.LastItemHoveredRect = true; window->DC.LastItemHoveredRect = true;
window->DC.LastItemHoveredAndUsable = false; window->DC.LastItemHoveredAndUsable = false;
if (g.ActiveId == 0 || (id && g.ActiveId == *id) || g.ActiveIdIsFocusedOnly || (g.ActiveId == window->MoveID)) if (g.ActiveId == 0 || (id && g.ActiveId == *id) || g.ActiveIdIsFocusedOnly || (g.ActiveId == window->MoveID))
if (!(g.FocusedWindow->Flags & ImGuiWindowFlags_Popup) || g.FocusedWindow == window) if (g.FocusedWindow == window || !((g.FocusedWindow->Flags & ImGuiWindowFlags_Popup) != 0 && g.FocusedWindow->WasVisible))
window->DC.LastItemHoveredAndUsable = true; window->DC.LastItemHoveredAndUsable = true;
} }
else else