walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 15 Wiki Activity

Fix y offset in BakeFontBitmap 

Compute Y offset more accurately and the way it is required in
renderer.c.

Instead of returning y offset wrt the baseline position returns it
wrt the top position (the baseline plus the font's ascent).
This commit is contained in:
Francesco Abbate 2020-06-01 14:33:46 +02:00
parent 4c6e15b66c
commit 0389bd000a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/font_renderer.cpp
View File

@ -68,7 +68,7 @@ int FontRendererBakeFontBitmap(FontRenderer *fr_, int font_height,
glyph_info.x1 = x_next_i; glyph_info.x1 = x_next_i;
glyph_info.y1 = pixels_height - (y_baseline + descender_px - pad_y); glyph_info.y1 = pixels_height - (y_baseline + descender_px - pad_y);
glyph_info.xoff = 0; glyph_info.xoff = 0;
glyph_info.yoff = -ascender * font_height; glyph_info.yoff = -pad_y;
glyph_info.xadvance = x_next - x; glyph_info.xadvance = x_next - x;
#if 0 #if 0
fprintf(stderr, fprintf(stderr,

8
src/renderer.c
View File

@ -129,14 +129,8 @@ retry:
goto retry; goto retry;
} }
// TODO: consider if this is still needed. /* adjust glyph's xadvance */
/* adjust glyph yoffsets and xadvance */
int ascent, descent, linegap;
stbtt_GetFontVMetrics(&font->stbfont, &ascent, &descent, &linegap);
float scale = stbtt_ScaleForMappingEmToPixels(&font->stbfont, font->size);
int scaled_ascent = ascent * scale + 0.5;
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
set->glyphs[i].yoff += scaled_ascent;
set->glyphs[i].xadvance = floor(set->glyphs[i].xadvance); set->glyphs[i].xadvance = floor(set->glyphs[i].xadvance);
} }