ImFontAtlas: Tweak to allow MergeMode to apply on a font that isn't the previous one, by setting the DstFont field.

ago%!(EXTRA string=9 years) · b4302187dd
parent 1dfafeb602
commit b4302187dd
1 changed files with 3 additions and 2 deletions
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@ -1141,6 +1141,7 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)

    ConfigData.push_back(*font_cfg);
    ImFontConfig& new_font_cfg = ConfigData.back();
+	if (!new_font_cfg.DstFont)
 	    new_font_cfg.DstFont = Fonts.back();
    if (!new_font_cfg.FontDataOwnedByAtlas)
    {
@ -1151,7 +1152,7 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)

    // Invalidate texture
    ClearTexData();
-    return Fonts.back();
+    return new_font_cfg.DstFont;
 }

 // Default font TTF is compressed with stb_compress then base85 encoded (see extra_fonts/binary_to_compressed_c.cpp for encoder)