organicmaps/imgui
13
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-04-07 22:43:09 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

Disabled: items more consistently release active id if the active item got disabled. (#211) (amend 2952525)

Browse source
This commit is contained in:
ocornut 2021-07-12 15:36:54 +02:00
parent 638e1a721b
commit 246ad6c03c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
imgui.cpp
View file

@ -3234,6 +3234,9 @@ bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id)
// When disabled we'll return false but still set HoveredId
if (g.CurrentItemFlags & ImGuiItemFlags_Disabled)
{
// Release active id if turning disabled
if (g.ActiveId == id)
ClearActiveID();
g.HoveredIdDisabled = true;
return false;
}

4
imgui_widgets.cpp
View file

@ -611,10 +611,6 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
}
}
// Release active id if turning disabled
if (g.ActiveId == id && (g.CurrentItemFlags & ImGuiItemFlags_Disabled))
ClearActiveID();
// Process while held
bool held = false;
if (g.ActiveId == id)