|
@@ -681,8 +681,6 @@ bool ImFontAtlasBuildWithFreeTypeEx(FT_Library ft_library, ImFontAtlas* atlas, u
|
|
for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
|
|
for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
|
|
{
|
|
{
|
|
ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
|
|
ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
|
|
- if (src_tmp.GlyphsCount == 0)
|
|
|
|
- continue;
|
|
|
|
|
|
|
|
// When merging fonts with MergeMode=true:
|
|
// When merging fonts with MergeMode=true:
|
|
// - We can have multiple input fonts writing into a same destination font.
|
|
// - We can have multiple input fonts writing into a same destination font.
|
|
@@ -693,6 +691,9 @@ bool ImFontAtlasBuildWithFreeTypeEx(FT_Library ft_library, ImFontAtlas* atlas, u
|
|
const float ascent = src_tmp.Font.Info.Ascender;
|
|
const float ascent = src_tmp.Font.Info.Ascender;
|
|
const float descent = src_tmp.Font.Info.Descender;
|
|
const float descent = src_tmp.Font.Info.Descender;
|
|
ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent);
|
|
ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent);
|
|
|
|
+
|
|
|
|
+ if (src_tmp.GlyphsCount == 0)
|
|
|
|
+ continue;
|
|
const float font_off_x = cfg.GlyphOffset.x;
|
|
const float font_off_x = cfg.GlyphOffset.x;
|
|
const float font_off_y = cfg.GlyphOffset.y + IM_ROUND(dst_font->Ascent);
|
|
const float font_off_y = cfg.GlyphOffset.y + IM_ROUND(dst_font->Ascent);
|
|
|
|
|