feedc0de/TFT_eSPI
1
0
Fork 0
forked from Bodmer/TFT_eSPI
Code Pull Requests Activity

Alt eingessene C Trottel

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-10-01 02:47:28 +02:00
parent 61dd1b856c
commit 4dacb617be
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
TFT_eSPI.cpp
View File

@@ -2969,16 +2969,22 @@ int16_t TFT_eSPI::textWidth(std::string_view string, uint8_t font)
else { else {
#ifdef LOAD_GFXFF #ifdef LOAD_GFXFF
if(gfxFont) { // New font if(gfxFont)
while (iter != std::end(string)) { {
// New font
while (*iter)
{
uniCode = decodeUTF8(*iter++); uniCode = decodeUTF8(*iter++);
if ((uniCode >= pgm_read_word(&gfxFont->first)) && (uniCode <= pgm_read_word(&gfxFont->last ))) { if ((uniCode >= pgm_read_word(&gfxFont->first)) && (uniCode <= pgm_read_word(&gfxFont->last)))
{
uniCode -= pgm_read_word(&gfxFont->first); uniCode -= pgm_read_word(&gfxFont->first);
GFXglyph *glyph = &(((GFXglyph *)pgm_read_dword(&gfxFont->glyph))[uniCode]); GFXglyph *glyph = &(((GFXglyph *)pgm_read_dword(&gfxFont->glyph))[uniCode]);
// If this is not the last character or is a digit then use xAdvance // If this is not the last character or is a digit then use xAdvance
if (iter != std::end(string) || isDigits) str_width += pgm_read_byte(&glyph->xAdvance); if (iter != std::end(string) || isDigits)
str_width += pgm_read_byte(&glyph->xAdvance);
// Else use the offset plus width since this can be bigger than xAdvance // Else use the offset plus width since this can be bigger than xAdvance
else str_width += ((int8_t)pgm_read_byte(&glyph->xOffset) + pgm_read_byte(&glyph->width)); else
str_width += ((int8_t)pgm_read_byte(&glyph->xOffset) + pgm_read_byte(&glyph->width));
} }
} }
} }
@@ -2986,7 +2992,7 @@ int16_t TFT_eSPI::textWidth(std::string_view string, uint8_t font)
#endif #endif
{ {
#ifdef LOAD_GLCD #ifdef LOAD_GLCD
while (iter != std::end(string)) str_width += 6; while (*iter++) str_width += 6;
#endif #endif
} }
} }