From 1c2aa35371aed8d895b3448dad865b913da57cfb Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 14 Feb 2010 06:26:16 +0000 Subject: FS#10984 - multifont! 2 major additions: 1) seperate UI font for the remote and main displays 2) allow individual skins to load additional fonts for use in the skin (Uo to 7 extra in this first version) see CustomWPS for info on how to load a font in the skins. Code should always use FONT_UI+screen_number to get the correct user font git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24644 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/rockpaint.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 96de7abab1..ae28258e3b 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -854,7 +854,7 @@ static bool browse_fonts( char *dst, int dst_size ) continue; rb->snprintf( bbuf, MAX_PATH, FONT_DIR "/%s", de->d_name ); - rb->font_load( bbuf ); + rb->font_load(NULL, bbuf ); rb->font_getstringsize( de->d_name, &fw, &fh, FONT_UI ); if( nvih > 0 ) { @@ -887,12 +887,12 @@ static bool browse_fonts( char *dst, int dst_size ) { rb->snprintf( bbuf, MAX_PATH, FONT_DIR "/%s", de->d_name ); - rb->font_load( bbuf ); + rb->font_load(NULL, bbuf ); rb->font_getstringsize( de->d_name, NULL, &fh, FONT_UI ); nvih = fh; } } - rb->font_load( buffer.text.old_font ); + rb->font_load(NULL, buffer.text.old_font ); rb->closedir( d ); } @@ -1526,7 +1526,7 @@ static void draw_text( int x, int y ) case TEXT_MENU_FONT: if( browse_fonts( buffer.text.font, MAX_PATH ) ) { - rb->font_load( buffer.text.font ); + rb->font_load(NULL, buffer.text.font ); } break; @@ -1583,7 +1583,7 @@ static void draw_text( int x, int y ) case TEXT_MENU_CANCEL: default: restore_screen(); - rb->font_load( buffer.text.old_font ); + rb->font_load(NULL, buffer.text.old_font ); return; } } -- cgit v1.2.3