ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d

This commit is contained in:
omar
2018-03-10 10:33:12 +01:00
parent 351b3fa7b0
commit 1f6ad7a894
4 changed files with 22 additions and 16 deletions

View File

@ -333,7 +333,7 @@ bool ImGuiFreeType::BuildFontAtlas(ImFontAtlas* atlas, unsigned int extra_flags)
{
for (uint32_t codepoint = in_range[0]; codepoint <= in_range[1]; ++codepoint)
{
if (cfg.MergeMode && dst_font->FindGlyph((unsigned short)codepoint))
if (cfg.MergeMode && dst_font->FindGlyphNoFallback((unsigned short)codepoint))
continue;
FT_Glyph ft_glyph = NULL;