mirror of
https://gitea.nishi.boats/pyrite-dev/milsko
synced 2026-01-03 16:10:50 +00:00
add MwNbitmapFont
This commit is contained in:
@@ -593,8 +593,12 @@ void MwSetDefault(MwWidget handle) {
|
||||
inherit_integer(handle, MwNmodernLook, 1);
|
||||
#endif
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2)
|
||||
inherit_integer(handle, MwNbitmapFont, 0);
|
||||
|
||||
set_font(handle);
|
||||
set_boldfont(handle);
|
||||
#else
|
||||
inherit_integer(handle, MwNbitmapFont, 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -294,7 +294,7 @@ static int ttf_MwTextHeight(MwWidget handle, int count) {
|
||||
void MwDrawText(MwWidget handle, MwPoint* point, const char* text, int bold, int align, MwLLColor color) {
|
||||
if(strlen(text) == 0) return;
|
||||
#ifdef TTF
|
||||
if(ttf_MwDrawText(handle, point, text, bold, align, color))
|
||||
if(!MwGetInteger(handle, MwNbitmapFont) && ttf_MwDrawText(handle, point, text, bold, align, color))
|
||||
#endif
|
||||
bitmap_MwDrawText(handle, point, text, bold, align, color);
|
||||
}
|
||||
@@ -304,7 +304,7 @@ int MwTextWidth(MwWidget handle, const char* text) {
|
||||
#ifdef TTF
|
||||
int st;
|
||||
|
||||
if((st = ttf_MwTextWidth(handle, text)) != -1) return st;
|
||||
if(!MwGetInteger(handle, MwNbitmapFont) && (st = ttf_MwTextWidth(handle, text)) != -1) return st;
|
||||
#else
|
||||
(void)handle;
|
||||
|
||||
@@ -331,7 +331,7 @@ int MwTextHeight(MwWidget handle, const char* text) {
|
||||
if(out == '\n') c++;
|
||||
}
|
||||
#ifdef TTF
|
||||
if((st = ttf_MwTextHeight(handle, c)) != -1) return st;
|
||||
if(!MwGetInteger(handle, MwNbitmapFont) && (st = ttf_MwTextHeight(handle, c)) != -1) return st;
|
||||
#endif
|
||||
return FontHeight * c;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user