1
0
Fork 0
forked from len0rd/rockbox

fix FS#11321 - the x5 remote used the wrong colours

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26276 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-05-25 04:02:09 +00:00
parent 9fe7b6cd20
commit 5c7be3e6cc

View file

@ -37,6 +37,11 @@
#define FG_FALLBACK LCD_DEFAULT_FG
#define BG_FALLBACK LCD_DEFAULT_BG
#endif
#ifdef HAVE_REMOTE_LCD
#define REMOTE_FG_FALLBACK LCD_REMOTE_DEFAULT_FG
#define REMOTE_BG_FALLBACK LCD_REMOTE_DEFAULT_BG
#endif
/* all below isn't needed for pc tools (i.e. checkwps/wps editor)
* only viewport_parse_viewport() is */
@ -229,7 +234,10 @@ static void viewportmanager_redraw(void* data)
{
#ifdef HAVE_LCD_BITMAP
if (is_theme_enabled(i))
{
printf("%d enabled\n", i);
sb_skin_update(i, NULL != data);
}
#else
(void)data;
gui_statusbar_draw(&statusbars.statusbars[i], NULL, NULL);
@ -437,9 +445,23 @@ const char* viewport_parse_viewport(struct viewport *vp,
#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
if (!LIST_VALUE_PARSED(set, PL_FG))
vp->fg_pattern = FG_FALLBACK;
{
#ifdef HAVE_REMOTE_LCD
if (screen == SCREEN_REMOTE)
vp->fg_pattern = REMOTE_FG_FALLBACK;
else
#endif
vp->fg_pattern = FG_FALLBACK;
}
if (!LIST_VALUE_PARSED(set, PL_BG))
vp->bg_pattern = BG_FALLBACK;
{
#ifdef HAVE_REMOTE_LCD
if (screen == SCREEN_REMOTE)
vp->bg_pattern = REMOTE_BG_FALLBACK;
else
#endif
vp->bg_pattern = BG_FALLBACK;
}
#endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */
#ifdef HAVE_LCD_COLOR