|
|
@ -1080,7 +1080,7 @@ static const char* GetDefaultCompressedFontDataTTFBase85(); |
|
|
|
static unsigned int Decode85Byte(char c) { return c >= '\\' ? c-36 : c-35; } |
|
|
|
static void Decode85(const unsigned char* src, unsigned int* dst) { for (; *src; src += 5) *dst++ = Decode85Byte(src[0]) + 85*(Decode85Byte(src[1]) + 85*(Decode85Byte(src[2]) + 85*(Decode85Byte(src[3]) + 85*Decode85Byte(src[4])))); } |
|
|
|
|
|
|
|
// Load embedded ProggyClean.ttf at size 13
|
|
|
|
// Load embedded ProggyClean.ttf at size 13, disable oversampling
|
|
|
|
ImFont* ImFontAtlas::AddFontDefault(const ImFontConfig* font_cfg_template) |
|
|
|
{ |
|
|
|
ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); |
|
|
@ -1108,6 +1108,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels, |
|
|
|
ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); |
|
|
|
if (font_cfg.Name[0] == '\0') |
|
|
|
{ |
|
|
|
// 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); |
|
|
|