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

Fonts: UpdateCurrentFontSize() early out doesn't need to clear FontBaked.

Browse source 
This was meant when the code would be lower in the function (after updating e.g. g.FontSize) Amend 0e769c5.
This commit is contained in:
ocornut 2025-06-13 16:47:23 +02:00
parent ca3169310e
commit d8da97f756
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
imgui.cpp
View file

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