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

Rename global_settings member glyphs to glyphs_to_cache and add descriptive comment.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31032 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Fred Bauer 2011-11-20 15:41:17 +00:00
parent ea7a89606c
commit fdfc88f38b
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,7 +467,7 @@ static int parse_font_load(struct skin_element *element,
if(element->params_count > 2) if(element->params_count > 2)
glyphs = get_param(element, 2)->data.number; glyphs = get_param(element, 2)->data.number;
else else
glyphs = global_settings.glyphs; glyphs = global_settings.glyphs_to_cache;
if (id < 2) if (id < 2)
{ {
DEBUGF("font id must be >= 2\n"); DEBUGF("font id must be >= 2\n");

2
apps/menus/settings_menu.c
View file

@ -222,7 +222,7 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL);
MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL);
MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
MENUITEM_SETTING(default_glyphs, &global_settings.glyphs, NULL); MENUITEM_SETTING(default_glyphs, &global_settings.glyphs_to_cache, NULL);
#endif #endif
MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON,
&max_files_in_dir, &max_files_in_playlist &max_files_in_dir, &max_files_in_playlist

2
apps/settings.c
View file

@ -886,7 +886,7 @@ void settings_apply(bool read_disk)
CHART2(">font_load ", global_settings.font_file); CHART2(">font_load ", global_settings.font_file);
if (font_ui >= 0) if (font_ui >= 0)
font_unload(font_ui); font_unload(font_ui);
rc = font_load_ex(buf, 0, global_settings.glyphs); rc = font_load_ex(buf, 0, global_settings.glyphs_to_cache);
CHART2("<font_load ", global_settings.font_file); CHART2("<font_load ", global_settings.font_file);
screens[SCREEN_MAIN].setuifont(rc); screens[SCREEN_MAIN].setuifont(rc);
screens[SCREEN_MAIN].setfont(rc); screens[SCREEN_MAIN].setfont(rc);

2
apps/settings.h
View file

@ -672,7 +672,7 @@ struct user_settings
unsigned char icon_file[MAX_FILENAME+1]; unsigned char icon_file[MAX_FILENAME+1];
unsigned char viewers_icon_file[MAX_FILENAME+1]; unsigned char viewers_icon_file[MAX_FILENAME+1];
unsigned char font_file[MAX_FILENAME+1]; /* last font */ unsigned char font_file[MAX_FILENAME+1]; /* last font */
int glyphs; int glyphs_to_cache; /* default font allocation size in glyphs */
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */ unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */
#endif #endif

2
apps/settings_list.c
View file

@ -1625,7 +1625,7 @@ const struct settings_list settings[] = {
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
TEXT_SETTING(F_THEMESETTING, font_file, "font", TEXT_SETTING(F_THEMESETTING, font_file, "font",
DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"), DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"),
INT_SETTING(0, glyphs, LANG_GLYPHS, DEFAULT_GLYPHS, INT_SETTING(0, glyphs_to_cache, LANG_GLYPHS, DEFAULT_GLYPHS,
"glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10, "glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10,
NULL, NULL, NULL), NULL, NULL, NULL),
#endif #endif