summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-03-09 23:53:46 +0000
committerDave Chapman <dave@dchapman.com>2008-03-09 23:53:46 +0000
commit2b7d48ede0ea8f36ff7b3166e0bbbd8c346c9207 (patch)
tree45d782e8fe9aff10507f74172b8cfd08192c823a
parent67481f5fd672bac50ae8fa8eb05b6b13ebe25035 (diff)
downloadrockbox-2b7d48ede0ea8f36ff7b3166e0bbbd8c346c9207.zip
rockbox-2b7d48ede0ea8f36ff7b3166e0bbbd8c346c9207.tar.gz
rockbox-2b7d48ede0ea8f36ff7b3166e0bbbd8c346c9207.tar.bz2
rockbox-2b7d48ede0ea8f36ff7b3166e0bbbd8c346c9207.tar.xz
Bugfix for new list implementation - correctly assign colours for remote LCDs (fixes wrong colours on X5 remote)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16599 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/viewport.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index ca7e574..8f26451 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -19,6 +19,7 @@
#include "config.h"
#include "lcd.h"
+#include "lcd-remote.h"
#include "font.h"
#include "sprintf.h"
#include "string.h"
@@ -57,7 +58,11 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
vp->drawmode = DRMODE_SOLID;
vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */
#endif
- if (screens[screen].depth > 1)
+
+#ifdef HAVE_REMOTE_LCD
+ /* We only need this test if there is a remote LCD */
+ if (screen == SCREEN_MAIN)
+#endif
{
#ifdef HAVE_LCD_COLOR
vp->fg_pattern = global_settings.fg_color;
@@ -70,4 +75,12 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
vp->bg_pattern = LCD_DEFAULT_BG;
#endif
}
+
+#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
+ if (screen == SCREEN_REMOTE)
+ {
+ vp->fg_pattern = LCD_REMOTE_DEFAULT_FG;
+ vp->bg_pattern = LCD_REMOTE_DEFAULT_BG;
+ }
+#endif
}