diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-21 19:10:09 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-21 19:10:09 +0000 |
| commit | f85103e8f2fe19b8e4495bc0317dd853f6aca23a (patch) | |
| tree | 5baa7ffc4bf27c260b25c8bd0f18ad2177a936f1 /apps | |
| parent | c5bb1925ebbeff7a49a938f9f00ddc66b1d6ca5d (diff) | |
| download | rockbox-f85103e8f2fe19b8e4495bc0317dd853f6aca23a.zip rockbox-f85103e8f2fe19b8e4495bc0317dd853f6aca23a.tar.gz rockbox-f85103e8f2fe19b8e4495bc0317dd853f6aca23a.tar.bz2 rockbox-f85103e8f2fe19b8e4495bc0317dd853f6aca23a.tar.xz | |
remote multifont fixes. it shoud be working again (blame AlexP! he made me break it last week!)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24812 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 5 | ||||
| -rw-r--r-- | apps/gui/statusbar-skinned.c | 4 | ||||
| -rw-r--r-- | apps/gui/viewport.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 4e0cc42..414da44 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -930,6 +930,11 @@ static int parse_viewport(const char *wps_bufptr, else vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */ +#ifdef HAVE_REMOTE_LCD + if (vp->font == FONT_UI && curr_screen == SCREEN_REMOTE) + vp->font = FONT_UI_REMOTE; + else +#endif if (vp->font > FONT_UI) vp->font = font_ids[vp->font - FONT_UI]; diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index fac6756..f5458fb 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c @@ -184,8 +184,8 @@ void sb_create_from_settings(enum screen_type screen) default: height = screens[screen].lcdheight; } - len = snprintf(ptr, remaining, "%%ax%%Vi|0|%d|-|%d|%d|-|-|\n", - y, height, FONT_UI + screen); + len = snprintf(ptr, remaining, "%%ax%%Vi|0|%d|-|%d|1|-|-|\n", + y, height); } sb_skin_data_load(screen, buf, false); } diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index ee233b9..142be1c 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c @@ -457,11 +457,7 @@ const char* viewport_parse_viewport(struct viewport *vp, * font 1 is *always* the UI font for the current screen * 2 is always the first extra font */ if (!LIST_VALUE_PARSED(set, PL_FONT)) - vp->font = FONT_UI + screen; -#ifdef HAVE_REMOTE_LCD - else if (vp->font == FONT_UI && screen == SCREEN_REMOTE) - vp->font = FONT_UI_REMOTE; -#endif + vp->font = FONT_UI; /* Set the defaults for fields not user-specified */ vp->drawmode = DRMODE_SOLID; |