mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-24 02:14:22 +00:00
Tooltips, Disabled: fixed EndDisabledOverrideReenable() assertion when nesting a tooltip in a disabled block. (#9180, #7640)
Amend f953ebf9ca
This commit is contained in:
parent
7250fbde2e
commit
e1217227b2
2 changed files with 3 additions and 1 deletions
|
|
@ -175,6 +175,8 @@ Other Changes:
|
|||
noticeable by user but detected by sanitizers). (#9089) [@judicaelclair]
|
||||
- InvisibleButton: allow calling with size (0,0) to fit to available content
|
||||
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
|
||||
flags of last submitted item. (#9127)
|
||||
- Images:
|
||||
|
|
|
|||
|
|
@ -8259,8 +8259,8 @@ void ImGui::BeginDisabledOverrideReenable()
|
|||
void ImGui::EndDisabledOverrideReenable()
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
g.DisabledStackSize--;
|
||||
IM_ASSERT(g.DisabledStackSize > 0);
|
||||
g.DisabledStackSize--;
|
||||
g.ItemFlagsStack.pop_back();
|
||||
g.CurrentItemFlags = g.ItemFlagsStack.back();
|
||||
g.Style.Alpha = g.CurrentWindowStack.back().DisabledOverrideReenableAlphaBackup;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue