Bodmer/TFT_eSPI
1
0
Fork 1
mirror of https://github.com/Bodmer/TFT_eSPI.git synced 2025-08-05 21:54:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #216

Browse Source
This commit is contained in:
Bodmer
2018-10-11 23:46:19 +01:00
parent a38efa5330
commit 1fd8d4cd6d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
TFT_eSPI.cpp
View File

@@ -4156,17 +4156,17 @@ int16_t TFT_eSPI::drawString(const char *string, int poX, int poY, int font)
uint16_t cheight = 8 * textsize; uint16_t cheight = 8 * textsize;
#ifdef LOAD_GFXFF #ifdef LOAD_GFXFF
if (font == 1) { bool freeFont = (font == 1 && gfxFont && !fontLoaded);
if(gfxFont) {
cheight = glyph_ab * textsize;
poY += cheight; // Adjust for baseline datum of free fonts
baseline = cheight;
padding =101; // Different padding method used for Free Fonts
// We need to make an adjustment for the bottom of the string (eg 'y' character) if (freeFont) {
if ((textdatum == BL_DATUM) || (textdatum == BC_DATUM) || (textdatum == BR_DATUM)) { cheight = glyph_ab * textsize;
cheight += glyph_bb * textsize; poY += cheight; // Adjust for baseline datum of free fonts
} baseline = cheight;
padding =101; // Different padding method used for Free Fonts
// We need to make an adjustment for the bottom of the string (eg 'y' character)
if ((textdatum == BL_DATUM) || (textdatum == BC_DATUM) || (textdatum == BR_DATUM)) {
cheight += glyph_bb * textsize;
} }
} }
#endif #endif
@@ -4250,7 +4250,7 @@ int16_t TFT_eSPI::drawString(const char *string, int poX, int poY, int font)
int8_t xo = 0; int8_t xo = 0;
#ifdef LOAD_GFXFF #ifdef LOAD_GFXFF
if ((font == 1) && (gfxFont) && (textcolor!=textbgcolor)) if (freeFont && (textcolor!=textbgcolor))
{ {
cheight = (glyph_ab + glyph_bb) * textsize; cheight = (glyph_ab + glyph_bb) * textsize;
// Get the offset for the first character only to allow for negative offsets // Get the offset for the first character only to allow for negative offsets
@@ -4306,7 +4306,7 @@ int16_t TFT_eSPI::drawString(const char *string, int poX, int poY, int font)
{ {
int16_t padXc = poX+cwidth+xo; int16_t padXc = poX+cwidth+xo;
#ifdef LOAD_GFXFF #ifdef LOAD_GFXFF
if ((font == 1) && (gfxFont)) if (freeFont)
{ {
poX +=xo; // Adjust for negative offset start character poX +=xo; // Adjust for negative offset start character
poY -= glyph_ab * textsize; poY -= glyph_ab * textsize;