pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

ft2: slightly better spacing
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
IoI_xD 2026-04-08 11:38:55 -07:00
commit d373f04eed
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/text/ft2.c
View file

@ -39,6 +39,10 @@ static int ft2_MwDrawText(MwWidget handle, MwFLFont ttf, MwPoint* point, const c
MwLLPixmap p; MwLLPixmap p;
MwRect r; MwRect r;
int x = 0, y = 0; int x = 0, y = 0;
float l1 = ttf->face->bbox.xMax - ttf->face->bbox.xMin;
float l2 =
ttf->face->bbox.yMax - ttf->face->bbox.yMin;
float length = ttf->face->bbox.xMax;
tw = MwTextWidth(handle, ttf, text); tw = MwTextWidth(handle, ttf, text);
th = MwTextHeight(handle, ttf, text); th = MwTextHeight(handle, ttf, text);
@ -77,7 +81,7 @@ static int ft2_MwDrawText(MwWidget handle, MwFLFont ttf, MwPoint* point, const c
} }
} }
x += ceil(ttf->face->glyph->metrics.horiAdvance / 64); x += (ttf->face->glyph->advance.x >> 6) + (ttf->face->glyph->metrics.horiBearingX >> 6);
old_text = text; old_text = text;
text += MwUTF8ToUTF32(text, &c2); text += MwUTF8ToUTF32(text, &c2);
@ -85,7 +89,7 @@ static int ft2_MwDrawText(MwWidget handle, MwFLFont ttf, MwPoint* point, const c
if(c2 != '\n') { if(c2 != '\n') {
ft_table.FT_Get_Kerning(ttf->face, c, c2, FT_KERNING_DEFAULT, &vec); ft_table.FT_Get_Kerning(ttf->face, c, c2, FT_KERNING_DEFAULT, &vec);
x += ceil(vec.x / 64); x += vec.x >> 6;
} }
text = old_text; text = old_text;
@ -118,9 +122,9 @@ static int ft2_MwTextWidth(MwFLFont ttf, const char* text) {
continue; continue;
} }
ft_table.FT_Load_Char(ttf->face, c, FT_LOAD_RENDER); ft_table.FT_Load_Char(ttf->face, c, FT_LOAD_DEFAULT);
tw += ceil(ttf->face->glyph->metrics.horiAdvance / 64); tw += (ttf->face->glyph->advance.x >> 6) + (ttf->face->glyph->metrics.horiBearingX >> 6);
old_text = text; old_text = text;
text += MwUTF8ToUTF32(text, &c2); text += MwUTF8ToUTF32(text, &c2);
@ -128,7 +132,7 @@ static int ft2_MwTextWidth(MwFLFont ttf, const char* text) {
if(c2 != '\n') { if(c2 != '\n') {
ft_table.FT_Get_Kerning(ttf->face, c, c2, FT_KERNING_DEFAULT, &vec); ft_table.FT_Get_Kerning(ttf->face, c, c2, FT_KERNING_DEFAULT, &vec);
tw += ceil(vec.x / 64); tw += vec.x >> 6;
} }
text = old_text; text = old_text;