mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CompareWithCurrentState uses IM_ASSERT_USER_ERROR 

I believe the current code is too harsh, and will fail on recoverable errors. This uses `IM_ASSERT_USER_ERROR` instead of `IM_ASSERT` in order to allow the UI in dev mode to yield errors. Also useful when doing scripting like Lua. Tried locally, and most of those errors seem recoverable properly anyway.
This commit is contained in:
Nicolas Noble 2022-09-06 13:16:21 -07:00 committed by GitHub
parent 2171375f93
commit 076ebec2d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imgui.cpp
View File

@ -8468,18 +8468,18 @@ void ImGuiStackSizes::CompareWithCurrentState()
// Window stacks
// NOT checking: DC.ItemWidth, DC.TextWrapPos (per window) to allow user to conveniently push once and not pop (they are cleared on Begin)
IM_ASSERT(SizeOfIDStack == window->IDStack.Size && "PushID/PopID or TreeNode/TreePop Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfIDStack == window->IDStack.Size , "PushID/PopID or TreeNode/TreePop Mismatch!");
// Global stacks
// For color, style and font stacks there is an incentive to use Push/Begin/Pop/.../End patterns, so we relax our checks a little to allow them.
IM_ASSERT(SizeOfGroupStack == g.GroupStack.Size && "BeginGroup/EndGroup Mismatch!");
IM_ASSERT(SizeOfBeginPopupStack == g.BeginPopupStack.Size && "BeginPopup/EndPopup or BeginMenu/EndMenu Mismatch!");
IM_ASSERT(SizeOfDisabledStack == g.DisabledStackSize && "BeginDisabled/EndDisabled Mismatch!");
IM_ASSERT(SizeOfItemFlagsStack >= g.ItemFlagsStack.Size && "PushItemFlag/PopItemFlag Mismatch!");
IM_ASSERT(SizeOfColorStack >= g.ColorStack.Size && "PushStyleColor/PopStyleColor Mismatch!");
IM_ASSERT(SizeOfStyleVarStack >= g.StyleVarStack.Size && "PushStyleVar/PopStyleVar Mismatch!");
IM_ASSERT(SizeOfFontStack >= g.FontStack.Size && "PushFont/PopFont Mismatch!");
IM_ASSERT(SizeOfFocusScopeStack == g.FocusScopeStack.Size && "PushFocusScope/PopFocusScope Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfGroupStack == g.GroupStack.Size , "BeginGroup/EndGroup Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfBeginPopupStack == g.BeginPopupStack.Size , "BeginPopup/EndPopup or BeginMenu/EndMenu Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfDisabledStack == g.DisabledStackSize , "BeginDisabled/EndDisabled Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfItemFlagsStack >= g.ItemFlagsStack.Size , "PushItemFlag/PopItemFlag Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfColorStack >= g.ColorStack.Size , "PushStyleColor/PopStyleColor Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfStyleVarStack >= g.StyleVarStack.Size , "PushStyleVar/PopStyleVar Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfFontStack >= g.FontStack.Size , "PushFont/PopFont Mismatch!");
IM_ASSERT_USER_ERROR(SizeOfFocusScopeStack == g.FocusScopeStack.Size , "PushFocusScope/PopFocusScope Mismatch!");
}