diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-03-01 15:16:05 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-03-01 15:16:05 +0000 |
| commit | 3b52937c8a0a1e739c04115d352e10b6ff0bba9d (patch) | |
| tree | 0e0c71255a2f6ab39e908504462b02d6defc9681 | |
| parent | f7533cceaa0b53ded2fe997e9bd8a11571ea84d1 (diff) | |
| download | rockbox-3b52937c8a0a1e739c04115d352e10b6ff0bba9d.zip rockbox-3b52937c8a0a1e739c04115d352e10b6ff0bba9d.tar.gz rockbox-3b52937c8a0a1e739c04115d352e10b6ff0bba9d.tar.bz2 rockbox-3b52937c8a0a1e739c04115d352e10b6ff0bba9d.tar.xz | |
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.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24983 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 2 | ||||
| -rw-r--r-- | firmware/export/font.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 3122878..13e2df5 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 */ -#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 diff --git a/firmware/export/font.h b/firmware/export/font.h index fb6438e..307db69 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h @@ -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 |