Correct textwrap limit (Issue #18)

This commit is contained in:
Bodmer
2017-05-22 23:43:26 +01:00
parent a2ab44f106
commit d9694ef50d
3 changed files with 4 additions and 4 deletions

View File

@@ -2773,7 +2773,7 @@ size_t TFT_eSPI::write(uint8_t utf8)
}
else
{
if (textwrap && (cursor_x + width * textsize >= _width))
if (textwrap && (cursor_x + width * textsize > _width))
{
cursor_y += height;
cursor_x = 0;
@@ -2801,7 +2801,7 @@ size_t TFT_eSPI::write(uint8_t utf8)
h = pgm_read_byte(&glyph->height);
if((w > 0) && (h > 0)) { // Is there an associated bitmap?
int16_t xo = (int8_t)pgm_read_byte(&glyph->xOffset);
if(textwrap && ((cursor_x + textsize * (xo + w)) >= _width)) {
if(textwrap && ((cursor_x + textsize * (xo + w)) > _width)) {
// Drawing character would go off right edge; wrap to new line
cursor_x = 0;
cursor_y += (int16_t)textsize *

View File

@@ -1,6 +1,6 @@
{
"name": "TFT_eSPI",
"version": "0.16.9",
"version": "0.16.10",
"keywords": "TFT, ESP8266, NodeMCU, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486",
"description": "A TFT SPI graphics library for ESP8266",
"repository":

View File

@@ -1,5 +1,5 @@
name=TFT_eSPI
version=0.16.9
version=0.16.10
author=Bodmer
maintainer=Bodmer
sentence=A fast TFT library for ESP8266 processors and the Arduino IDE