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

Redo r30826 (and hopefully not reintroduce font issues) which cleans up the font API. FONT_UI is deprecated, use screens[screen].getuifont() instead (and .setuifont() to set it after a font has been loaded)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30932 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-11-08 10:09:33 +00:00
parent 452a3ce274
commit f19f3efb07
13 changed files with 94 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

43
apps/screen_access.c
View file

@ -77,6 +77,24 @@ void screen_helper_setfont(int font)
#endif
}
int screen_helper_getuifont(void)
{
#ifdef HAVE_LCD_BITMAP
return global_status.font_id[SCREEN_MAIN];
#else
return FONT_SYSFIXED;
#endif
}
void screen_helper_setuifont(int font)
{
#ifdef HAVE_LCD_BITMAP
global_status.font_id[SCREEN_MAIN] = font;
#else
(void)font;
#endif
}
#if NB_SCREENS == 2
static int screen_helper_remote_getcharwidth(void)
{
@ -116,6 +134,23 @@ void screen_helper_remote_setfont(int font)
font = global_status.font_id[SCREEN_REMOTE];
lcd_remote_setfont(font);
}
int screen_helper_remote_getuifont(void)
{
#ifdef HAVE_LCD_BITMAP
return global_status.font_id[SCREEN_REMOTE];
#else
return FONT_SYSFIXED;
#endif
}
void screen_helper_remote_setuifont(int font)
{
#ifdef HAVE_LCD_BITMAP
global_status.font_id[SCREEN_REMOTE] = font;
#endif
}
#endif
struct screen screens[NB_SCREENS] =
@ -147,7 +182,8 @@ struct screen screens[NB_SCREENS] =
.getstringsize=&lcd_getstringsize,
#ifdef HAVE_LCD_BITMAP
.setfont=screen_helper_setfont,
.getfont=&lcd_getfont,
.getuifont=screen_helper_getuifont,
.setuifont=screen_helper_setuifont,
.mono_bitmap=&lcd_mono_bitmap,
.mono_bitmap_part=&lcd_mono_bitmap_part,
.set_drawmode=&lcd_set_drawmode,
@ -246,8 +282,9 @@ struct screen screens[NB_SCREENS] =
.getheight=&lcd_remote_getheight,
.getstringsize=&lcd_remote_getstringsize,
#if 1 /* all remote LCDs are bitmapped so far */
.setfont=screen_helper_setfont,
.getfont=&lcd_remote_getfont,
.setfont=screen_helper_remote_setfont,
.getuifont=screen_helper_remote_getuifont,
.setuifont=screen_helper_remote_setuifont,
.mono_bitmap=&lcd_remote_mono_bitmap,
.mono_bitmap_part=&lcd_remote_mono_bitmap_part,
.bitmap=(screen_bitmap_func*)&lcd_remote_bitmap,