Fonts: avoid calling GetFontBaked() during SetFontSize(). Also fixes loading extraneous baked on atlas that will be locked

e.g. PushFontSize() before NewFrame() on legacy backend.
This commit is contained in:
ocornut
2025-05-26 18:55:55 +02:00
parent 033cdc4133
commit b029be6b6c

View File

@@ -8715,9 +8715,9 @@ void ImGui::UpdateCurrentFontSize()
final_size = ImMax(1.0f, final_size);
if (g.Font != NULL && (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasTextures))
g.Font->CurrentRasterizerDensity = g.FontRasterizerDensity;
g.FontBaked = (g.Font != NULL) ? g.Font->GetFontBaked(final_size) : NULL;
g.FontSize = final_size;
g.FontScale = (g.Font != NULL) ? (g.FontSize / g.FontBaked->Size) : 0.0f;
g.FontBaked = (g.Font != NULL && window != NULL) ? g.Font->GetFontBaked(final_size) : NULL;
g.FontScale = (g.Font != NULL && window != NULL) ? (g.FontSize / g.FontBaked->Size) : 0.0f;
g.DrawListSharedData.FontSize = g.FontSize;
g.DrawListSharedData.FontScale = g.FontScale;
}