From 241d65a6a5ab4553e5ad30b8cf86cc2139630787 Mon Sep 17 00:00:00 2001
From: mrwastl <mrwastl@users.sourceforge.net>
Date: Sun, 5 Jun 2011 23:11:24 +0200
Subject: improved scrolling of texts: no more premature end of scrolling

---
 glcdskin/object.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/glcdskin/object.c b/glcdskin/object.c
index 806a738..1b1417b 100644
--- a/glcdskin/object.c
+++ b/glcdskin/object.c
@@ -720,9 +720,8 @@ void cSkinObject::Render(GLCD::cBitmap * screen)
                         }
 
                         if (updateScroll) {
-                            mScrollOffset += currScrollSpeed;
-
-                            if ( x + Size().w + mScrollOffset >= (w+Size().w - font->Width("  "))) {
+                            mScrollOffset += currScrollSpeed;                            
+                            if ( mScrollOffset >= w ) {
                                 if (currScrollLoopMode == 1)
                                     // reset mScrollOffset in next step (else: string not redrawn when scroll done)
                                     mScrollLoopReached = true;
-- 
cgit v1.2.3