diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-05-14 22:55:05 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-05-14 22:55:05 +0000 |
commit | 2d446fef067a8fbf86343160df3799870d65aa6a (patch) | |
tree | 15edae3baf50a3f66f4e4b2407e61f4845d640fb /apps/screens.c | |
parent | c431e227367d18b6b487b7f72aab2653c529450f (diff) | |
download | rockbox-2d446fef067a8fbf86343160df3799870d65aa6a.tar.gz rockbox-2d446fef067a8fbf86343160df3799870d65aa6a.zip |
Fixed lcd_bitmap() to use the bitmap format generated by bmp2rb correctly. Now it works for height > 8. Adapted font transposing & changed some other places to take advantage of that. bounce.c was (apart from fonts) the only routine that used the old format correctly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4620 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/apps/screens.c b/apps/screens.c index b563155bde..a5b9f90796 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -84,15 +84,7 @@ void usb_display_info(void) | |||
84 | lcd_clear_display(); | 84 | lcd_clear_display(); |
85 | 85 | ||
86 | #ifdef HAVE_LCD_BITMAP | 86 | #ifdef HAVE_LCD_BITMAP |
87 | /* lcd_bitmap() only supports 16 pixels height! */ | 87 | lcd_bitmap(usb_logo, 6, 16, BMPWIDTH_usb_logo, BMPHEIGHT_usb_logo, false); |
88 | lcd_bitmap(usb_logo, 6, 16, | ||
89 | BMPWIDTH_usb_logo, 8, false); | ||
90 | lcd_bitmap(usb_logo+BMPWIDTH_usb_logo, 6, 24, | ||
91 | BMPWIDTH_usb_logo, 8, false); | ||
92 | lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*2, 6, 32, | ||
93 | BMPWIDTH_usb_logo, 8, false); | ||
94 | lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*3, 6, 40, | ||
95 | BMPWIDTH_usb_logo, 8, false); | ||
96 | status_draw(true); | 88 | status_draw(true); |
97 | lcd_update(); | 89 | lcd_update(); |
98 | #else | 90 | #else |
@@ -534,7 +526,7 @@ bool quick_screen(int context, int button) | |||
534 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 526 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); |
535 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 527 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
536 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 528 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); |
537 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], | 529 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], |
538 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); | 530 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); |
539 | 531 | ||
540 | lcd_update(); | 532 | lcd_update(); |