From 0161814c9a1301b0b854687396f895a7af537cbb Mon Sep 17 00:00:00 2001 From: Bodmer Date: Sun, 1 Mar 2020 18:40:54 +0000 Subject: [PATCH] Add smooth font wrapping in a Sprite See #558 --- Extensions/Sprite.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Extensions/Sprite.cpp b/Extensions/Sprite.cpp index 648ff7c..4d87024 100644 --- a/Extensions/Sprite.cpp +++ b/Extensions/Sprite.cpp @@ -2347,6 +2347,18 @@ void TFT_eSprite::drawGlyph(uint16_t code) this->cursor_x = -this->gdX[gNum]; this->cursor_y = 0; } + else + { + if( this->textwrapX && ((this->cursor_x + this->gWidth[gNum] + this->gdX[gNum]) >= _iwidth)) { + this->cursor_y += this->gFont.yAdvance; + this->cursor_x = 0; + } + + if( this->textwrapY && ((this->cursor_y + this->gFont.yAdvance) >= _iheight)) this->cursor_y = 0; + + if ( this->cursor_x == 0) this->cursor_x -= this->gdX[gNum]; + + } uint8_t* pbuffer = nullptr; const uint8_t* gPtr = (const uint8_t*) this->gFont.gArray;