diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-11-13 15:37:16 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-11-13 15:37:16 +0000 |
commit | 9a70c42241c70e57bbe739f45d254c67bacc83e7 (patch) | |
tree | 2387eebfd2f3ad83c5e4e69d6d39fd37f234d928 /apps/gui/usb_screen.c | |
parent | 61f61c97738a3f0e279b7c31f9096a5aaa977291 (diff) | |
download | rockbox-9a70c42241c70e57bbe739f45d254c67bacc83e7.tar.gz rockbox-9a70c42241c70e57bbe739f45d254c67bacc83e7.zip |
Add the ability to create a prefilled struct bitmap along with generated images.
This allows to directly draw generated and builtin images using lcd_bmp(bm_xxx);
Also fixes builtin list icons on non-mono targets, as they didn't have the
format field set.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30971 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/usb_screen.c')
-rw-r--r-- | apps/gui/usb_screen.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 2b7d47209b..002f4557bb 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -184,6 +184,12 @@ static void usb_screen_fix_viewports(struct screen *screen, | |||
184 | 184 | ||
185 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | 185 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) |
186 | { | 186 | { |
187 | static const struct bitmap* logos[NB_SCREENS] = { | ||
188 | &bm_usblogo, | ||
189 | #ifdef HAVE_RE | ||
190 | &bm_remote_usblogo, | ||
191 | #endif | ||
192 | }; | ||
187 | FOR_NB_SCREENS(i) | 193 | FOR_NB_SCREENS(i) |
188 | { | 194 | { |
189 | struct screen *screen = &screens[i]; | 195 | struct screen *screen = &screens[i]; |
@@ -200,17 +206,9 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
200 | 206 | ||
201 | #ifdef HAVE_LCD_BITMAP | 207 | #ifdef HAVE_LCD_BITMAP |
202 | screen->set_viewport(logo); | 208 | screen->set_viewport(logo); |
203 | #ifdef HAVE_REMOTE_LCD | 209 | screen->bmp(logos[i], 0, 0); |
204 | if (i == SCREEN_REMOTE) | 210 | if (i == SCREEN_MAIN) |
205 | { | ||
206 | screen->bitmap(remote_usblogo, 0, 0, logo->width, | ||
207 | logo->height); | ||
208 | } | ||
209 | else | ||
210 | #endif | ||
211 | { | 211 | { |
212 | screen->transparent_bitmap(usblogo, 0, 0, logo->width, | ||
213 | logo->height); | ||
214 | #ifdef USB_ENABLE_HID | 212 | #ifdef USB_ENABLE_HID |
215 | if (usb_hid) | 213 | if (usb_hid) |
216 | { | 214 | { |