Fix BeginDisabled(false), (ocornut#211, ocornut#4452)

AnClark · Aug 30, 2021 · 88126b3 · 88126b3
1 parent f866dd1
commit 88126b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/imgui.cpp b/imgui.cpp
@@ -6627,12 +6627,9 @@ void ImGui::BeginDisabled(bool disabled)
 {
     ImGuiContext& g = *GImGui;
     bool was_disabled = (g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0;
+    g.DisabledAlphaBackup = g.Style.Alpha;
     if (!was_disabled && disabled)
-    {
-        //PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * g.Style.DisabledAlpha);
-        g.DisabledAlphaBackup = g.Style.Alpha;
-        g.Style.Alpha *= g.Style.DisabledAlpha;
-    }
+        g.Style.Alpha *= g.Style.DisabledAlpha; // PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * g.Style.DisabledAlpha);
     //PushItemFlag(ImGuiItemFlags_Disabled, was_disabled || disabled);
     g.CurrentItemFlags |= ImGuiItemFlags_Disabled;
     g.ItemFlagsStack.push_back(g.CurrentItemFlags);

diff --git a/imgui.h b/imgui.h
@@ -61,7 +61,7 @@ Index of this file:
 // Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
 #define IMGUI_VERSION               "1.84"
-#define IMGUI_VERSION_NUM           18400
+#define IMGUI_VERSION_NUM           18401
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 #define IMGUI_HAS_TABLE