mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Fonts: amend UpdateCurentFontSize() early out optimization.

Browse source
This commit is contained in:
ocornut 2025-06-10 17:56:09 +02:00
parent 573f08135d
commit 0e769c5418
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
imgui.cpp
View file

@ -8739,8 +8739,15 @@ void ImGui::UpdateCurrentFontSize(float restore_font_size_after_scaling)
ImGuiWindow* window = g.CurrentWindow;
g.Style.FontSizeBase = g.FontSizeBase;
// Early out to avoid hidden window keeping bakes referenced and out of GC reach.
// However this would leave a pretty subtle and damning error surface area if g.FontBaked was mismatching, so for now we null it.
if (window != NULL && window->SkipItems)
return;
if (g.CurrentTable == NULL || g.CurrentTable->CurrentColumn != -1) // See 8465#issuecomment-2951509561. Ideally the SkipItems=true in tables would be amended with extra data.
{
g.FontBaked = NULL;
return;
}
// Restoring is pretty much only used by PopFont()/PopFontSize()
float final_size = (restore_font_size_after_scaling > 0.0f) ? restore_font_size_after_scaling : 0.0f;