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

remote multifont fixes. it shoud be working again (blame AlexP! he made me break it last week!)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24812 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-02-21 19:10:09 +00:00
parent c5bb1925eb
commit f85103e8f2
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/gui/skin_engine/skin_parser.c
View file

@ -930,6 +930,11 @@ static int parse_viewport(const char *wps_bufptr,
else else
vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */ 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) if (vp->font > FONT_UI)
vp->font = font_ids[vp->font - FONT_UI]; vp->font = font_ids[vp->font - FONT_UI];

4
apps/gui/statusbar-skinned.c
View file

@ -184,8 +184,8 @@ void sb_create_from_settings(enum screen_type screen)
default: default:
height = screens[screen].lcdheight; height = screens[screen].lcdheight;
} }
len = snprintf(ptr, remaining, "%%ax%%Vi|0|%d|-|%d|%d|-|-|\n", len = snprintf(ptr, remaining, "%%ax%%Vi|0|%d|-|%d|1|-|-|\n",
y, height, FONT_UI + screen); y, height);
} }
sb_skin_data_load(screen, buf, false); sb_skin_data_load(screen, buf, false);
} }

6
apps/gui/viewport.c
View file

@ -457,11 +457,7 @@ const char* viewport_parse_viewport(struct viewport *vp,
* font 1 is *always* the UI font for the current screen * font 1 is *always* the UI font for the current screen
* 2 is always the first extra font */ * 2 is always the first extra font */
if (!LIST_VALUE_PARSED(set, PL_FONT)) if (!LIST_VALUE_PARSED(set, PL_FONT))
vp->font = FONT_UI + screen; vp->font = FONT_UI;
#ifdef HAVE_REMOTE_LCD
else if (vp->font == FONT_UI && screen == SCREEN_REMOTE)
vp->font = FONT_UI_REMOTE;
#endif
/* Set the defaults for fields not user-specified */ /* Set the defaults for fields not user-specified */
vp->drawmode = DRMODE_SOLID; vp->drawmode = DRMODE_SOLID;

3
firmware/font.c
View file

@ -98,6 +98,9 @@ void font_init(void)
while (i<MAXFONTS) while (i<MAXFONTS)
sysfonts[i++] = NULL; sysfonts[i++] = NULL;
font_reset(NULL); font_reset(NULL);
#ifdef HAVE_REMOTE_LCD
font_reset(&remote_font_ui);
#endif
} }
/* Check if we have x bytes left in the file buffer */ /* Check if we have x bytes left in the file buffer */