summaryrefslogtreecommitdiff
path: root/apps/screens.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-05-14 22:55:05 +0000
committerJens Arnold <amiconn@rockbox.org>2004-05-14 22:55:05 +0000
commit2d446fef067a8fbf86343160df3799870d65aa6a (patch)
tree15edae3baf50a3f66f4e4b2407e61f4845d640fb /apps/screens.c
parentc431e227367d18b6b487b7f72aab2653c529450f (diff)
downloadrockbox-2d446fef067a8fbf86343160df3799870d65aa6a.zip
rockbox-2d446fef067a8fbf86343160df3799870d65aa6a.tar.gz
rockbox-2d446fef067a8fbf86343160df3799870d65aa6a.tar.bz2
rockbox-2d446fef067a8fbf86343160df3799870d65aa6a.tar.xz
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.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/apps/screens.c b/apps/screens.c
index b563155..a5b9f90 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -84,15 +84,7 @@ void usb_display_info(void)
lcd_clear_display();
#ifdef HAVE_LCD_BITMAP
- /* lcd_bitmap() only supports 16 pixels height! */
- lcd_bitmap(usb_logo, 6, 16,
- BMPWIDTH_usb_logo, 8, false);
- lcd_bitmap(usb_logo+BMPWIDTH_usb_logo, 6, 24,
- BMPWIDTH_usb_logo, 8, false);
- lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*2, 6, 32,
- BMPWIDTH_usb_logo, 8, false);
- lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*3, 6, 40,
- BMPWIDTH_usb_logo, 8, false);
+ lcd_bitmap(usb_logo, 6, 16, BMPWIDTH_usb_logo, BMPHEIGHT_usb_logo, false);
status_draw(true);
lcd_update();
#else
@@ -534,7 +526,7 @@ bool quick_screen(int context, int button)
LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true);
lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow],
LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true);
- lcd_bitmap(bitmap_icons_7x8[Icon_FastForward],
+ lcd_bitmap(bitmap_icons_7x8[Icon_FastForward],
LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true);
lcd_update();