commit 246ad6c03c419560c422f5edbb0b5727fb40b405
author ocornut <omarcornut@gmail.com> Mon Jul 12 15:36:54 2021 +0200
committer ocornut <omarcornut@gmail.com> Mon Jul 12 15:39:47 2021 +0200
tree 7ef41e4f5f9e75fd7a4d8be161c168c2dea455bf
parent 638e1a721be3f7f9a99ca2836165d6c12a6f0b4c

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

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 8ae49a8..fe96577 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3234,6 +3234,9 @@
     // 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;
     }

imgui_widgets.cpp

diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 48a01ea..f841018 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -611,10 +611,6 @@
         }
     }
 
-    // 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)