|
|
|
@ -1184,7 +1184,7 @@ ImFont* ImFontAtlas::AddFontDefault(const ImFontConfig* font_cfg_template) |
|
|
|
|
font_cfg.OversampleH = font_cfg.OversampleV = 1; |
|
|
|
|
font_cfg.PixelSnapH = true; |
|
|
|
|
} |
|
|
|
|
if (font_cfg.Name[0] == '\0') strcpy(font_cfg.Name, "ProggyClean.ttf"); |
|
|
|
|
if (font_cfg.Name[0] == '\0') strcpy(font_cfg.Name, "ProggyClean.ttf, 13px"); |
|
|
|
|
|
|
|
|
|
const char* ttf_compressed_base85 = GetDefaultCompressedFontDataTTFBase85(); |
|
|
|
|
ImFont* font = AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, 13.0f, &font_cfg, GetGlyphRangesDefault()); |
|
|
|
@ -1206,7 +1206,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels, |
|
|
|
|
// Store a short copy of filename into into the font name for convenience
|
|
|
|
|
const char* p; |
|
|
|
|
for (p = filename + strlen(filename); p > filename && p[-1] != '/' && p[-1] != '\\'; p--) {} |
|
|
|
|
snprintf(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "%s", p); |
|
|
|
|
snprintf(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "%s, %.0fpx", p, size_pixels); |
|
|
|
|
} |
|
|
|
|
return AddFontFromMemoryTTF(data, data_size, size_pixels, &font_cfg, glyph_ranges); |
|
|
|
|
} |
|
|
|
|