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

Rename some menu enums

Browse Source
This commit is contained in:
twinaphex 2014-10-28 06:31:34 +01:00
parent 054a16ff8a
commit 607c6a2809
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/menu_common.c
View File

@ -464,7 +464,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
{
if (
type == MENU_SETTINGS ||
type == MENU_FILE_CATEGORY ||
type == MENU_SETTING_CATEGORY ||
!strcmp(label, "Shader Options") ||
!strcmp(label, "core_options") ||
!strcmp(label, "core_information") ||

4
frontend/menu/menu_common.h
View File

@ -63,7 +63,6 @@ typedef enum
MENU_FILE_DIRECTORY,
MENU_FILE_PATH,
MENU_FILE_DEVICE,
MENU_FILE_DRIVER,
MENU_FILE_LINEFEED,
MENU_FILE_LINEFEED_SWITCH,
MENU_FILE_CORE,
@ -79,8 +78,9 @@ typedef enum
MENU_FILE_PUSH,
MENU_FILE_CARCHIVE,
MENU_FILE_IN_CARCHIVE,
MENU_FILE_CATEGORY,
MENU_SETTING_CATEGORY,
MENU_SETTINGS,
MENU_SETTING_DRIVER,
} menu_file_type_t;
typedef enum

4
frontend/menu/menu_entries.c
View File

@ -116,11 +116,11 @@ int setting_set_flags(rarch_setting_t *setting)
if (setting->flags & SD_FLAG_PUSH_ACTION)
return MENU_FILE_PUSH;
if (setting->flags & SD_FLAG_IS_DRIVER)
return MENU_FILE_DRIVER;
return MENU_SETTING_DRIVER;
if (setting->type == ST_PATH)
return MENU_FILE_PATH;
if (setting->flags & SD_FLAG_IS_CATEGORY)
return MENU_FILE_CATEGORY;
return MENU_SETTING_CATEGORY;
return 0;
}

4
frontend/menu/menu_entries_cbs.c
View File

@ -1866,7 +1866,7 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
cbs->action_ok = action_ok_custom_viewport;
break;
case MENU_SETTINGS:
case MENU_FILE_CATEGORY:
case MENU_SETTING_CATEGORY:
cbs->action_ok = action_ok_push_default;
break;
case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS:
@ -2011,7 +2011,7 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
if (!strcmp(label, "history_list"))
cbs->action_deferred_push = deferred_push_history_list;
else if (type == MENU_FILE_CATEGORY)
else if (type == MENU_SETTING_CATEGORY)
cbs->action_deferred_push = deferred_push_category;
else if (!strcmp(label, "deferred_core_list"))
cbs->action_deferred_push = deferred_push_core_list_deferred;