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

Fonts: AddFont() functions now allow size_pixels==0.0f (only required when using certain functions)

Browse source 
Fonts: AddFont() funcitons allow size_pixels==0 for merged fonts.
This commit is contained in:
ocornut 2025-06-06 16:33:02 +02:00
parent bc394410a2
commit 02f58b3207
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
imgui_draw.cpp
View file

@ -4533,11 +4533,14 @@ static bool ImGui_ImplStbTrueType_FontSrcInit(ImFontAtlas* atlas, ImFontConfig*
}
src->FontLoaderData = bd_font_data;
if (src->MergeMode && src->SizePixels == 0.0f)
src->SizePixels = src->DstFont->Sources[0]->SizePixels;
if (src->SizePixels >= 0.0f)
bd_font_data->ScaleFactor = stbtt_ScaleForPixelHeight(&bd_font_data->FontInfo, 1.0f);
else
bd_font_data->ScaleFactor = stbtt_ScaleForMappingEmToPixels(&bd_font_data->FontInfo, 1.0f);
if (src != src->DstFont->Sources[0])
if (src->MergeMode && src->SizePixels != 0.0f)
bd_font_data->ScaleFactor *= src->SizePixels / src->DstFont->Sources[0]->SizePixels; // FIXME-NEWATLAS: Should tidy up that a bit
return true;