mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor MENU_SETTINGS_FONT_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2014-09-04 19:05:03 +02:00
parent e77ba49b3a
commit adf7794216
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/disp/shared.h
View File

@ -45,7 +45,7 @@ static void get_title(const char *label, const char *dir,
else if (menu_type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS) else if (menu_type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS)
strlcpy(title, "SHADER PARAMETERS (MENU PRESET)", sizeof_title); strlcpy(title, "SHADER PARAMETERS (MENU PRESET)", sizeof_title);
#endif #endif
else if (menu_type == MENU_SETTINGS_FONT_OPTIONS) else if (!strcmp(label, "Font Options"))
strlcpy(title, "FONT OPTIONS", sizeof_title); strlcpy(title, "FONT OPTIONS", sizeof_title);
else if (!strcmp(dir, "General Options")) else if (!strcmp(dir, "General Options"))
strlcpy(title, "GENERAL OPTIONS", sizeof_title); strlcpy(title, "GENERAL OPTIONS", sizeof_title);

2
frontend/menu/menu_common.c
View File

@ -648,7 +648,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
!strcmp(label, "core_options") || !strcmp(label, "core_options") ||
!strcmp(label, "core_information") || !strcmp(label, "core_information") ||
!strcmp(label, "Video Options") || !strcmp(label, "Video Options") ||
type == MENU_SETTINGS_FONT_OPTIONS || !strcmp(label, "Font Options") ||
type == MENU_SETTINGS_SHADER_OPTIONS || type == MENU_SETTINGS_SHADER_OPTIONS ||
type == MENU_SETTINGS_SHADER_PARAMETERS || type == MENU_SETTINGS_SHADER_PARAMETERS ||
type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS || type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS ||

1
frontend/menu/menu_common.h
View File

@ -89,7 +89,6 @@ typedef enum
// Shader stuff // Shader stuff
MENU_SETTINGS_VIDEO_RESOLUTION = MENU_SETTINGS + 1, MENU_SETTINGS_VIDEO_RESOLUTION = MENU_SETTINGS + 1,
MENU_SETTINGS_CUSTOM_VIEWPORT, MENU_SETTINGS_CUSTOM_VIEWPORT,
MENU_SETTINGS_FONT_OPTIONS,
MENU_SETTINGS_SHADER_OPTIONS, MENU_SETTINGS_SHADER_OPTIONS,
MENU_SETTINGS_SHADER_FILTER, MENU_SETTINGS_SHADER_FILTER,
MENU_SETTINGS_SHADER_PRESET, MENU_SETTINGS_SHADER_PRESET,

13
frontend/menu/menu_entries.c
View File

@ -429,6 +429,12 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"video_refresh_rate", 0, setting_data); add_setting_entry(menu,list,"video_refresh_rate", 0, setting_data);
add_setting_entry(menu,list,"video_refresh_rate_auto", 0, setting_data); add_setting_entry(menu,list,"video_refresh_rate_auto", 0, setting_data);
} }
else if (!strcmp(label, "Font Options"))
{
file_list_clear(list);
add_setting_entry(menu,list,"video_font_enable", 0, setting_data);
add_setting_entry(menu,list,"video_font_size", 0, setting_data);
}
else else
{ {
switch (menu_type) switch (menu_type)
@ -490,18 +496,13 @@ int menu_entries_push_list(menu_handle_t *menu,
} }
} }
break; break;
case MENU_SETTINGS_FONT_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"video_font_enable", 0, setting_data);
add_setting_entry(menu,list,"video_font_size", 0, setting_data);
break;
case MENU_SETTINGS_OPTIONS: case MENU_SETTINGS_OPTIONS:
file_list_clear(list); file_list_clear(list);
add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data); add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"General Options", MENU_FILE_SWITCH, setting_data); add_setting_entry(menu,list,"General Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Video Options", MENU_FILE_SWITCH, setting_data); add_setting_entry(menu,list,"Video Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data); add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data); add_setting_entry(menu,list,"Font Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Audio Options", MENU_FILE_SWITCH, setting_data); add_setting_entry(menu,list,"Audio Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_FILE_SWITCH, setting_data); add_setting_entry(menu,list,"Input Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data); add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);