Seich
/
TFT_eSPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: When the print function is used with a free font, the vertical offset shifts.

This commit is contained in:
lovyan03 2019-11-22 12:03:59 +09:00
parent 4c25fe279c
commit cf85a66752
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Extensions/Sprite.cpp
View File

@ -1447,8 +1447,12 @@ size_t TFT_eSprite::write(uint8_t utf8)
this->cursor_x = 0; this->cursor_x = 0;
this->cursor_y += (int16_t)textsize * (uint8_t)pgm_read_byte(&gfxFont->yAdvance); this->cursor_y += (int16_t)textsize * (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
} }
if (textwrapY && (this->cursor_y >= _iheight)) this->cursor_y = 0; int32_t y = this->cursor_y + glyph_ab * textsize; // Adjust for baseline datum of free fonts
drawChar(this->cursor_x, this->cursor_y, uniCode, textcolor, textbgcolor, textsize); if (textwrapY && (y >= (int32_t)_iheight)) {
this->cursor_y = 0;
y = glyph_ab * textsize;
}
drawChar(this->cursor_x, y, uniCode, textcolor, textbgcolor, textsize);
} }
this->cursor_x += pgm_read_byte(&glyph->xAdvance) * (int16_t)textsize; this->cursor_x += pgm_read_byte(&glyph->xAdvance) * (int16_t)textsize;
} }