From f19f3efb078b2947638f6f7a7f209de44daf78b3 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 8 Nov 2011 10:09:33 +0000 Subject: 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) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30932 a1c6a512-1295-4272-9138-f99709370657 --- apps/filetree.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'apps/filetree.c') diff --git a/apps/filetree.c b/apps/filetree.c index 2407be9..d33b823 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -424,13 +424,10 @@ static void ft_load_font(char *file) set_file(file, (char *)global_settings.font_file, MAX_FILENAME); #endif splash(0, ID2P(LANG_WAIT)); - current_font_id = global_status.font_id[screen]; + current_font_id = screens[screen].getuifont(); if (current_font_id >= 0) font_unload(current_font_id); - current_font_id = font_load(file); - if(screen==SCREEN_MAIN) - font_set_ui(current_font_id); - global_status.font_id[screen] = current_font_id; + screens[screen].setuifont(font_load(file)); viewportmanager_theme_changed(THEME_UI_VIEWPORT); } #endif -- cgit v1.1