From 92e46622e5f26f86216b3fd3b023b63a6a886ef2 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Tue, 11 Jun 2002 07:55:43 +0000 Subject: Don't scroll lines shorter than the screen git-svn-id: svn://svn.rockbox.org/rockbox/trunk@949 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 9389caafbd..b7e4cc70fa 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -780,15 +780,16 @@ void lcd_puts_scroll(int x, int y, char* string ) s->space = (LCD_WIDTH - xmargin - x) / width; #endif lcd_puts(x,y,string); - s->offset=0; - s->xpos=x; - s->startx=x; - s->starty=y; s->textlen = strlen(string); - strncpy(s->text,string,sizeof s->text); - s->text[sizeof s->text - 1] = 0; - - scroll_count = 1; + if ( s->textlen > s->space ) { + s->offset=0; + s->xpos=x; + s->startx=x; + s->starty=y; + strncpy(s->text,string,sizeof s->text); + s->text[sizeof s->text - 1] = 0; + scroll_count = 1; + } } void lcd_stop_scroll(void) -- cgit v1.2.3