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

Fix #1313

This commit is contained in:
Bodmer 2021-12-12 01:33:27 +00:00
parent bcce0fc7ce
commit a474f4cd23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Extensions/Sprite.cpp
View File

@ -2529,19 +2529,24 @@ void TFT_eSprite::printToSprite(char *cbuffer, uint16_t len) //String string)
uint16_t n = 0; uint16_t n = 0;
bool newSprite = !_created; bool newSprite = !_created;
int16_t cursorX = _tft->cursor_x;
if (newSprite) if (newSprite)
{ {
int16_t sWidth = 1; int16_t sWidth = 0;
uint16_t index = 0; uint16_t index = 0;
bool first = true;
while (n < len) while (n < len)
{ {
uint16_t unicode = decodeUTF8((uint8_t*)cbuffer, &n, len - n); uint16_t unicode = decodeUTF8((uint8_t*)cbuffer, &n, len - n);
if (getUnicodeIndex(unicode, &index)) if (getUnicodeIndex(unicode, &index))
{ {
if (n == 0) sWidth -= gdX[index]; if (first) {
if (n == len-1) sWidth += ( gWidth[index] + gdX[index]); first = false;
sWidth -= gdX[index];
cursorX += gdX[index];
}
if (n == len) sWidth += ( gWidth[index] + gdX[index]);
else sWidth += gxAdvance[index]; else sWidth += gxAdvance[index];
} }
else sWidth += gFont.spaceWidth + 1; else sWidth += gFont.spaceWidth + 1;
@ -2564,7 +2569,7 @@ void TFT_eSprite::printToSprite(char *cbuffer, uint16_t len) //String string)
if (newSprite) if (newSprite)
{ // The sprite had to be created so place at TFT cursor { // The sprite had to be created so place at TFT cursor
pushSprite(_tft->cursor_x, _tft->cursor_y); pushSprite(cursorX, _tft->cursor_y);
deleteSprite(); deleteSprite();
} }
} }