nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-06 17:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

add MwNbitmapFont

Browse Source
This commit is contained in:
NishiOwO
2025-12-19 22:35:26 +09:00
parent a384add9e9
commit 604ff72d6e
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Mw/StringDefs.h
View File

@@ -35,6 +35,7 @@
#define MwNratio "Iratio" #define MwNratio "Iratio"
#define MwNfixedSize "IfixedSize" #define MwNfixedSize "IfixedSize"
#define MwNmargin "Imargin" #define MwNmargin "Imargin"
#define MwNbitmapFont "IbitmapFont"
#define MwNtitle "Stitle" #define MwNtitle "Stitle"
#define MwNtext "Stext" #define MwNtext "Stext"

2
milsko.xml
View File

@@ -51,6 +51,7 @@
- MwNbackgroundPixmap - MwNbackgroundPixmap
- MwNratio - MwNratio
- MwNfixedSize - MwNfixedSize
- MwNbitmapFont
Integer properties must be prefixed with I. Integer properties must be prefixed with I.
String properties must be prefixed with S. String properties must be prefixed with S.
@@ -87,6 +88,7 @@
<integer name="ratio" /> <integer name="ratio" />
<integer name="fixedSize" /> <integer name="fixedSize" />
<integer name="margin" /> <integer name="margin" />
<integer name="bitmapFont" />
<string name="title" /> <string name="title" />
<string name="text" /> <string name="text" />

4
src/core.c
View File

@@ -593,8 +593,12 @@ void MwSetDefault(MwWidget handle) {
inherit_integer(handle, MwNmodernLook, 1); inherit_integer(handle, MwNmodernLook, 1);
#endif #endif
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) #if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2)
inherit_integer(handle, MwNbitmapFont, 0);
set_font(handle); set_font(handle);
set_boldfont(handle); set_boldfont(handle);
#else
inherit_integer(handle, MwNbitmapFont, 1);
#endif #endif
} }

6
src/text.c
View File

@@ -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) { void MwDrawText(MwWidget handle, MwPoint* point, const char* text, int bold, int align, MwLLColor color) {
if(strlen(text) == 0) return; if(strlen(text) == 0) return;
#ifdef TTF #ifdef TTF
if(ttf_MwDrawText(handle, point, text, bold, align, color)) if(!MwGetInteger(handle, MwNbitmapFont) && ttf_MwDrawText(handle, point, text, bold, align, color))
#endif #endif
bitmap_MwDrawText(handle, point, text, bold, align, color); bitmap_MwDrawText(handle, point, text, bold, align, color);
} }
@@ -304,7 +304,7 @@ int MwTextWidth(MwWidget handle, const char* text) {
#ifdef TTF #ifdef TTF
int st; int st;
if((st = ttf_MwTextWidth(handle, text)) != -1) return st; if(!MwGetInteger(handle, MwNbitmapFont) && (st = ttf_MwTextWidth(handle, text)) != -1) return st;
#else #else
(void)handle; (void)handle;
@@ -331,7 +331,7 @@ int MwTextHeight(MwWidget handle, const char* text) {
if(out == '\n') c++; if(out == '\n') c++;
} }
#ifdef TTF #ifdef TTF
if((st = ttf_MwTextHeight(handle, c)) != -1) return st; if(!MwGetInteger(handle, MwNbitmapFont) && (st = ttf_MwTextHeight(handle, c)) != -1) return st;
#endif #endif
return FontHeight * c; return FontHeight * c;
} }