diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-06-20 12:48:24 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-06-20 12:48:24 +0000 |
commit | 57aa1f4de4c6c58224750308464354dcb6c57a3f (patch) | |
tree | 2deb7d003e3c134dcd84f9ee0afd950190c90cab | |
parent | ee7ddfa4981fa9f716fc679f8023e8627ca06b71 (diff) | |
download | rockbox-57aa1f4de4c6c58224750308464354dcb6c57a3f.tar.gz rockbox-57aa1f4de4c6c58224750308464354dcb6c57a3f.zip |
Clear area for proportional scroll
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1126 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/lcd.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 8c24fc7b7d..15d4955501 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c | |||
@@ -497,10 +497,10 @@ extern unsigned char char_dw_8x8_prop[][9]; | |||
497 | */ | 497 | */ |
498 | void lcd_getstringsize(char *str, unsigned int font, int *w, int *h) | 498 | void lcd_getstringsize(char *str, unsigned int font, int *w, int *h) |
499 | { | 499 | { |
500 | (void)font; | ||
501 | int width=0; | 500 | int width=0; |
502 | int height=0; | 501 | int height=0; |
503 | unsigned char ch, byte; | 502 | unsigned char ch, byte; |
503 | (void)font; | ||
504 | 504 | ||
505 | while((ch = *str++)) { | 505 | while((ch = *str++)) { |
506 | /* Limit to char generation table */ | 506 | /* Limit to char generation table */ |
@@ -581,8 +581,8 @@ void lcd_puts(int x, int y, char *str) | |||
581 | 581 | ||
582 | #ifdef LCD_PROPFONTS | 582 | #ifdef LCD_PROPFONTS |
583 | lcd_putspropxy( xmargin + x*fonts[font], | 583 | lcd_putspropxy( xmargin + x*fonts[font], |
584 | ymargin + y*fontheight[font], | 584 | ymargin + y*fontheight[font], |
585 | str, font ); | 585 | str, font ); |
586 | #else | 586 | #else |
587 | lcd_putsxy( xmargin + x*fonts[font], | 587 | lcd_putsxy( xmargin + x*fonts[font], |
588 | ymargin + y*fontheight[font], | 588 | ymargin + y*fontheight[font], |
@@ -981,6 +981,12 @@ static void scroll_thread(void) | |||
981 | s->offset = 0; | 981 | s->offset = 0; |
982 | } | 982 | } |
983 | 983 | ||
984 | #ifdef LCD_PROPFONTS | ||
985 | lcd_clearrect(xmargin + s->startx*fonts[font], | ||
986 | ymargin + s->starty*fontheight[font], | ||
987 | LCD_WIDTH - xmargin, | ||
988 | fontheight[font]); | ||
989 | #endif | ||
984 | lcd_puts(s->startx,s->starty,s->line); | 990 | lcd_puts(s->startx,s->starty,s->line); |
985 | lcd_update(); | 991 | lcd_update(); |
986 | } | 992 | } |