Merge pull request #51 from per1234/fix-scroll-clearing

Fix scroll trail clearing bugs

Author: leonardocavagnis

.codespellrc

@@ -1,7 +1,7 @@
 # See: https://github.com/codespell-project/codespell#using-a-config-file
 [codespell]
 # In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
-ignore-words-list = mis
+ignore-words-list = cleary,mis
 check-filenames =
 check-hidden =
 skip = ./.git

src/ArduinoGraphics.cpp

@@ -448,17 +448,21 @@ void ArduinoGraphics::endText(int scrollDirection)
   uint8_t strokeG = _strokeG;
   uint8_t strokeB = _strokeB;
 
-
-  stroke(_textR, _textG, _textB);
-
   if (scrollDirection == SCROLL_LEFT) {
     int scrollLength = _textBuffer.length() * textFontWidth() + _textX + 1;
 
     for (int i = 0; i < scrollLength; i++) {
       beginDraw();
+
       int const text_x = _textX - i;
+      stroke(_textR, _textG, _textB);
       text(_textBuffer, text_x, _textY);
-      bitmap(_font->data[0x20], text_x - 1, _textY, 1, _font->height, _textSizeX, _textSizeY);
+
+      // clear previous position
+      const int clearX = text_x + _textBuffer.length() * _font->width;
+      stroke(_backgroundR, _backgroundG, _backgroundB);
+      line(clearX, _textY, clearX, _textY + _font->height - 1);
+
       endDraw();
 
       delay(_textScrollSpeed);
@@ -468,9 +472,18 @@ void ArduinoGraphics::endText(int scrollDirection)
 
     for (int i = 0; i < scrollLength; i++) {
       beginDraw();
+
       int const text_x = _textX - (scrollLength - i - 1);
+      stroke(_textR, _textG, _textB);
       text(_textBuffer, text_x, _textY);
+
+      // clear previous position
+      const int clearX = text_x - 1;
+      stroke(_backgroundR, _backgroundG, _backgroundB);
+      line(clearX, _textY, clearX, _textY + _font->height - 1);
+
       bitmap(_font->data[0x20], text_x - 1, _textY, 1, _font->height, _textSizeX, _textSizeY);
+
       endDraw();
 
       delay(_textScrollSpeed);
@@ -480,9 +493,16 @@ void ArduinoGraphics::endText(int scrollDirection)
 
     for (int i = 0; i < scrollLength; i++) {
       beginDraw();
+
       int const text_y = _textY - i;
+      stroke(_textR, _textG, _textB);
       text(_textBuffer, _textX, text_y);
-      bitmap(_font->data[0x20], _textX, text_y - 1, _font->width, 1, _textSizeX, _textSizeY);
+
+      // clear previous position
+      const int clearY = text_y + _font->height;
+      stroke(_backgroundR, _backgroundG, _backgroundB);
+      line(_textX, clearY, _textX + (_font->width * _textBuffer.length()) - 1, clearY);
+
       endDraw();
 
       delay(_textScrollSpeed);
@@ -492,15 +512,24 @@ void ArduinoGraphics::endText(int scrollDirection)
 
     for (int i = 0; i < scrollLength; i++) {
       beginDraw();
+
       int const text_y = _textY - (scrollLength - i - 1);
+      stroke(_textR, _textG, _textB);
       text(_textBuffer, _textX, text_y);
+
+      // clear previous position
+      const int clearY = text_y - 1;
+      stroke(_backgroundR, _backgroundG, _backgroundB);
+      line(_textX, clearY, _textX + (_font->width * _textBuffer.length()) - 1, clearY);
+
       bitmap(_font->data[0x20], _textX, text_y - 1, _font->width, 1, _textSizeX, _textSizeY);
       endDraw();
 
       delay(_textScrollSpeed);
     }
   } else {
     beginDraw();
+    stroke(_textR, _textG, _textB);
     text(_textBuffer, _textX, _textY);
     endDraw();
   }