Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert r24958. It didn't fix anything (in fact, the problem described didn't exist). Increase MAXFONTS by 1 to allow for remote screen targets to load fonts 2-9.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24983 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-03-01 15:16:05 +00:00
parent f7533cceaa
commit 3b52937c8a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -935,10 +935,10 @@ static int parse_viewport(const char *wps_bufptr,
else
vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
#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

3
firmware/export/font.h
View file

@ -55,7 +55,8 @@ enum {
FONT_FIRSTUSERFONT = 2
};
#define MAXFONTS 10
/* SYSFONT, FONT_UI, FONT_UI_REMOTE + 8 fonts in skins */
#define MAXFONTS 11
/*
* .fnt loadable font file format definition