devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

More fixes for the usb screen: Use send_event(GUI_EVENT_REFRESH, NULL) to get rid of dead parts if the custom ui viewport is used as intended (it also redraws the statusbars additionally to clear&update). Redo the the statusbar handling to use the viewportmanager to properly force the remote statusbar on also.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22534 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-08-29 15:17:16 +00:00
parent bd023385fb
commit cc1be6b766
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/screens.c
View file

@ -63,6 +63,8 @@
#include "yesno.h" #include "yesno.h"
#include "backdrop.h" #include "backdrop.h"
#include "viewport.h" #include "viewport.h"
#include "appevents.h"
#include "statusbar.h"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#include "bitmaps/usblogo.h" #include "bitmaps/usblogo.h"
@ -181,16 +183,15 @@ void usb_screen(void)
/* nothing here! */ /* nothing here! */
#else #else
int i; int i;
int statusbar = global_settings.statusbar; /* force the statusbar */ int usb_bars = VP_SB_ALLSCREENS; /* force statusbars */
if(!global_settings.statusbar) int old_bars = viewportmanager_get_statusbar();
global_settings.statusbar = STATUSBAR_TOP;
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
screens[i].backdrop_show(BACKDROP_MAIN); screens[i].backdrop_show(BACKDROP_MAIN);
screens[i].backlight_on(); screens[i].backlight_on();
screens[i].clear_display(); screens[i].clear_display();
#if NB_SCREENS > 1 #ifdef HAVE_REMOTE_LCD
if (i == SCREEN_REMOTE) if (i == SCREEN_REMOTE)
{ {
screens[i].bitmap(remote_usblogo, screens[i].bitmap(remote_usblogo,
@ -199,8 +200,8 @@ void usb_screen(void)
BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo); BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo);
} }
else else
{
#endif #endif
{
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
screens[i].transparent_bitmap(usblogo, screens[i].transparent_bitmap(usblogo,
(LCD_WIDTH-BMPWIDTH_usblogo), (LCD_WIDTH-BMPWIDTH_usblogo),
@ -213,11 +214,12 @@ void usb_screen(void)
status_set_audio(false); status_set_audio(false);
status_set_usb(true); status_set_usb(true);
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
#if NB_SCREENS > 1
} }
#endif
screens[i].update(); screens[i].update();
} }
FOR_NB_SCREENS(i)
usb_bars |= VP_SB_IGNORE_SETTING(i);
viewportmanager_set_statusbar(usb_bars);
#ifdef SIMULATOR #ifdef SIMULATOR
while (button_get(true) & BUTTON_REL); while (button_get(true) & BUTTON_REL);
@ -231,10 +233,10 @@ void usb_screen(void)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
screens[i].backlight_on(); screens[i].backlight_on();
screens[i].clear_display();
screens[i].update();
} }
global_settings.statusbar = statusbar; viewportmanager_set_statusbar(old_bars);
send_event(GUI_EVENT_REFRESH, NULL);
#endif /* USB_NONE */ #endif /* USB_NONE */
} }