Fixed nested BeginDisabled()/EndDisabled() bug in Docking branch due to bad merge. (#4655, #4452, #4453, #4462)

features/sdl_renderer3_multiviewports
ocornut ago%!(EXTRA string=4 years)
parent 9b59455184
commit 05877c14df
  1. 4
      docs/CHANGELOG.txt
  2. 1
      imgui.cpp

@ -119,6 +119,10 @@ Other Changes:
- Misc: Fix MinGW DLL build issue (when IMGUI_API is defined). [@rokups]
- CI: Add MinGW DLL build to test suite. [@rokups]
Docking+Viewports Branch:
- Disabled: Fixed nested BeginDisabled()/EndDisabled() bug in Docking branch due to bad merge. (#4655, #4452, #4453, #4462)
-----------------------------------------------------------------------
VERSION 1.85 (Released 2021-10-12)

@ -7187,7 +7187,6 @@ 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)
{
g.DisabledAlphaBackup = g.Style.Alpha;

Loading…
Cancel
Save