summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-02-28 08:48:04 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-02-28 08:48:04 +0000
commit6434e760fc52fcfa45fc68dd4b2dbfc97588a4f1 (patch)
treefa81a2781becb4e2c818d0d57c491acdba667412
parent8717c1eaa12ce23501d1c6e6103eaed310204243 (diff)
downloadrockbox-6434e760fc52fcfa45fc68dd4b2dbfc97588a4f1.zip
rockbox-6434e760fc52fcfa45fc68dd4b2dbfc97588a4f1.tar.gz
rockbox-6434e760fc52fcfa45fc68dd4b2dbfc97588a4f1.tar.bz2
rockbox-6434e760fc52fcfa45fc68dd4b2dbfc97588a4f1.tar.xz
move a #ifdef so the full amount of user choosable skin fonts are avilable on non remote targets (i.e 2-9 inclusive)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24958 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 01913e4..3122878 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -935,10 +935,10 @@ static int parse_viewport(const char *wps_bufptr,
else
vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
- /* increment because font=2 and FONT_UI_REMOTE is ambiguous */
+#ifdef HAVE_REMOTE_LCD
+ /* increment because font==2 and FONT_UI_REMOTE is ambiguous */
if (vp->font > FONT_UI)
vp->font++;
-#ifdef HAVE_REMOTE_LCD
if (vp->font == FONT_UI && curr_screen == SCREEN_REMOTE)
vp->font = FONT_UI_REMOTE;
#endif