mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor MENU_SETTINGS_OVERLAY_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2014-09-04 18:12:14 +02:00
parent 8366ea976b
commit b6b5896bab
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ static void get_title(const char *label, const char *dir,
menu_type == MENU_SETTINGS_CUSTOM_BIND ||
menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
strlcpy(title, "INPUT OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_OVERLAY_OPTIONS)
else if (!strcmp(label, "Overlay Options"))
strlcpy(title, "OVERLAY OPTIONS", sizeof_title);
else if (!strcmp(label, "Netplay Options"))
strlcpy(title, "NETPLAY OPTIONS", sizeof_title);

2
frontend/menu/menu_common.c
View File

@ -656,7 +656,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
type == MENU_SETTINGS_DISK_OPTIONS ||
type == MENU_SETTINGS_PATH_OPTIONS ||
!strcmp(label, "Privacy Options") ||
type == MENU_SETTINGS_OVERLAY_OPTIONS ||
!strcmp(label, "Overlay Options") ||
!strcmp(label, "User Options") ||
!strcmp(label, "Netplay Options") ||
type == MENU_SETTINGS_OPTIONS ||

1
frontend/menu/menu_common.h
View File

@ -112,7 +112,6 @@ typedef enum
MENU_SETTINGS_AUDIO_OPTIONS,
MENU_SETTINGS_INPUT_OPTIONS,
MENU_SETTINGS_PATH_OPTIONS,
MENU_SETTINGS_OVERLAY_OPTIONS,
MENU_SETTINGS_OPTIONS,
MENU_SETTINGS_DRIVERS,
MENU_SETTINGS_DISK_OPTIONS,

16
frontend/menu/menu_entries.c
View File

@ -321,6 +321,13 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"camera_allow", 0, setting_data);
add_setting_entry(menu,list,"location_allow", 0, setting_data);
}
else if (!strcmp(label, "Overlay Options"))
{
file_list_clear(list);
add_setting_entry(menu,list,"input_overlay", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
}
else
{
switch (menu_type)
@ -448,8 +455,7 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Audio Options", MENU_SETTINGS_AUDIO_OPTIONS, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_SETTINGS_INPUT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_SETTINGS_OVERLAY_OPTIONS,
setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"User Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Netplay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Path Options", MENU_SETTINGS_PATH_OPTIONS, setting_data);
@ -469,12 +475,6 @@ int menu_entries_push_list(menu_handle_t *menu,
file_list_push(list, "Disk Image Append", "",
MENU_SETTINGS_DISK_APPEND, 0);
break;
case MENU_SETTINGS_OVERLAY_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"input_overlay", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
break;
case MENU_SETTINGS_PATH_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"rgui_browser_directory", 0, setting_data);