uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Support negative baseline_x in a font.

Browse Source
This commit is contained in:
inmarket 2018-01-09 17:53:30 +10:00
parent c41cbd05e9
commit 013bac84ce
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gdisp/mcufont/mf_font.h
View File

@ -43,7 +43,7 @@ struct mf_font_s
uint8_t max_x_advance; uint8_t max_x_advance;
/* Location of the text baseline relative to character. */ /* Location of the text baseline relative to character. */
uint8_t baseline_x; int8_t baseline_x;
uint8_t baseline_y; uint8_t baseline_y;
/* Line height of the font (vertical advance). */ /* Line height of the font (vertical advance). */

4
src/gdisp/mcufont/mf_wordwrap.c
View File

@ -51,10 +51,8 @@ static bool get_wordlen(const struct mf_font_s *font, mf_str *text,
{ {
result->chars++; result->chars++;
if (c == ' ') if (c == ' ' || c == '-')
result->space += mf_character_width(font, c); result->space += mf_character_width(font, c);
else if (c == '-')
result->space += mf_character_width(font, '-');
else if (c == '\t') else if (c == '\t')
result->space += mf_character_width(font, 'm') * MF_TABSIZE; result->space += mf_character_width(font, 'm') * MF_TABSIZE;
else if (c == '\n') { else if (c == '\n') {