diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-06-11 07:55:43 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-06-11 07:55:43 +0000 |
| commit | 92e46622e5f26f86216b3fd3b023b63a6a886ef2 (patch) | |
| tree | 89861d97fc4baf6b80593ba84bd62e41f4d7821e | |
| parent | f4a2941b3c3790972b88c646155f814589aac8ae (diff) | |
| download | rockbox-92e46622e5f26f86216b3fd3b023b63a6a886ef2.zip rockbox-92e46622e5f26f86216b3fd3b023b63a6a886ef2.tar.gz rockbox-92e46622e5f26f86216b3fd3b023b63a6a886ef2.tar.bz2 rockbox-92e46622e5f26f86216b3fd3b023b63a6a886ef2.tar.xz | |
Don't scroll lines shorter than the screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@949 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/lcd.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 9389caa..b7e4cc7 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) |