[Slim-Checkins] r8999 - /trunk/server/Slim/Display/Graphics.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Thu Aug 17 05:50:00 2006
New Revision: 8999

URL: http://svn.slimdevices.com?rev=8999&view=rev
Log:
Bug: N/A
Description: Fix case where scrolling text could occur on top of the
same static text.  This occured if the overlay changes with the same
text in the line component, such that scrolling of the text is no
longer needed.

Modified:
    trunk/server/Slim/Display/Graphics.pm

Modified: trunk/server/Slim/Display/Graphics.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Graphics.pm?rev=8999&r1=8998&r2=8999&view=diff
==============================================================================
--- trunk/server/Slim/Display/Graphics.pm (original)
+++ trunk/server/Slim/Display/Graphics.pm Thu Aug 17 05:50:00 2006
@@ -327,6 +327,11 @@
 			} elsif ($sc->{linefinish}[$l] <= $sc->{overlaystart}[$l] ) {
 				# no need to scroll - assemble line + pad + overlay
 				$bits |= $sc->{linebits}[$l] . chr(0) x ($sc->{overlaystart}[$l] - $sc->{linefinish}[$l]) . $sc->{overlaybits}[$l];
+				if ($sc->{scroll} && $sc->{scrollline} == $l) {
+					# previously scrolling same text on this line but no longer needed - probably due to overlay change
+					$sc->{scroll} = 0;
+					$sc->{scrolline} = undef;
+				}
 
 			} elsif (!$scroll || $l == 0 || ($sc->{scroll} && $sc->{scrollline} != $l)) {
 				# scrolling not enabled, line 0 or already scrolling for another line - truncate line