organicmaps/imgui
13
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-04-04 21:15:09 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

WIP - Fonts: Fixed PopFont() recovery.

Browse source 
(To squash into "Added PushFontSize(), PopFontSize() api."
This commit is contained in:
ocornut 2025-03-17 23:19:22 +01:00
parent 359c313110
commit 7dc98e3303
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
imgui.cpp
View file

@ -5989,9 +5989,9 @@ void ImGui::EndFrame()
}
// End frame
PopFont();
g.WithinFrameScope = false;
g.FrameCountEnded = g.FrameCount;
PopFont();
// Initiate moving window + handle left-click and right-click focus
UpdateMouseMovingWindowEndFrame();
@ -8546,7 +8546,7 @@ static void PushDefaultFont()
void ImGui::PopFont()
{
ImGuiContext& g = *GImGui;
if (g.FontStack.Size <= 0)
if (g.FontStack.Size <= 1 && g.WithinFrameScope)
{
IM_ASSERT_USER_ERROR(0, "Calling PopFont() too many times!");
return;