Tooltips, Disabled: fixed EndDisabledOverrideReenable() assertion when nesting a tooltip in a disabled block. (#9180, #7640)
Amend f953ebf9ca
This commit is contained in:
committed by
ocornut
parent
7250fbde2e
commit
e1217227b2
@@ -175,6 +175,8 @@ Other Changes:
|
|||||||
noticeable by user but detected by sanitizers). (#9089) [@judicaelclair]
|
noticeable by user but detected by sanitizers). (#9089) [@judicaelclair]
|
||||||
- InvisibleButton: allow calling with size (0,0) to fit to available content
|
- InvisibleButton: allow calling with size (0,0) to fit to available content
|
||||||
size. (#9166, #7623)
|
size. (#9166, #7623)
|
||||||
|
- Tooltips, Disabled: fixed EndDisabledOverrideReenable() assertion when
|
||||||
|
nesting a tooltip in a disabled block. (#9180, #7640) [@RegimantasSimkus]
|
||||||
- Added GetItemFlags() in public API for consistency and to expose generic
|
- Added GetItemFlags() in public API for consistency and to expose generic
|
||||||
flags of last submitted item. (#9127)
|
flags of last submitted item. (#9127)
|
||||||
- Images:
|
- Images:
|
||||||
|
|||||||
@@ -8259,8 +8259,8 @@ void ImGui::BeginDisabledOverrideReenable()
|
|||||||
void ImGui::EndDisabledOverrideReenable()
|
void ImGui::EndDisabledOverrideReenable()
|
||||||
{
|
{
|
||||||
ImGuiContext& g = *GImGui;
|
ImGuiContext& g = *GImGui;
|
||||||
g.DisabledStackSize--;
|
|
||||||
IM_ASSERT(g.DisabledStackSize > 0);
|
IM_ASSERT(g.DisabledStackSize > 0);
|
||||||
|
g.DisabledStackSize--;
|
||||||
g.ItemFlagsStack.pop_back();
|
g.ItemFlagsStack.pop_back();
|
||||||
g.CurrentItemFlags = g.ItemFlagsStack.back();
|
g.CurrentItemFlags = g.ItemFlagsStack.back();
|
||||||
g.Style.Alpha = g.CurrentWindowStack.back().DisabledOverrideReenableAlphaBackup;
|
g.Style.Alpha = g.CurrentWindowStack.back().DisabledOverrideReenableAlphaBackup;
|
||||||
|
|||||||
Reference in New Issue
Block a user