|
@@ -4573,15 +4573,16 @@ static bool ImGui_ImplStbTrueType_FontSrcInit(ImFontAtlas* atlas, ImFontConfig*
|
|
|
}
|
|
|
src->FontLoaderData = bd_font_data;
|
|
|
|
|
|
+ const float ref_size = src->DstFont->Sources[0]->SizePixels;
|
|
|
if (src->MergeMode && src->SizePixels == 0.0f)
|
|
|
- src->SizePixels = src->DstFont->Sources[0]->SizePixels;
|
|
|
+ src->SizePixels = ref_size;
|
|
|
|
|
|
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->MergeMode && src->SizePixels != 0.0f)
|
|
|
- bd_font_data->ScaleFactor *= src->SizePixels / src->DstFont->Sources[0]->SizePixels; // FIXME-NEWATLAS: Should tidy up that a bit
|
|
|
+ if (src->MergeMode && src->SizePixels != 0.0f && ref_size != 0.0f)
|
|
|
+ bd_font_data->ScaleFactor *= src->SizePixels / ref_size; // FIXME-NEWATLAS: Should tidy up that a bit
|
|
|
|
|
|
return true;
|
|
|
}
|