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 MENU_FILE_PUSH to MENU_SETTING_ACTION

Browse Source
This commit is contained in:
twinaphex 2014-10-28 06:36:52 +01:00
parent 607c6a2809
commit 82ca0e8853
4 changed files with 12 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

@ -217,7 +217,7 @@ static void disp_set_label(file_list_t* list,
core_option_get_val(g_extern.system.core_options,
type - MENU_SETTINGS_CORE_OPTION_START),
type_str_size);
else if (type == MENU_FILE_PUSH || type == MENU_FILE_LINEFEED_SWITCH)
else if (type == MENU_SETTING_ACTION || type == MENU_FILE_LINEFEED_SWITCH)
strlcpy(type_str, "...", type_str_size);
else
setting_data_get_label(type_str,

3
frontend/menu/menu_common.h
View File

@ -75,12 +75,13 @@ typedef enum
MENU_FILE_FONT,
MENU_FILE_CONFIG,
MENU_FILE_USE_DIRECTORY,
MENU_FILE_PUSH,
MENU_FILE_CARCHIVE,
MENU_FILE_IN_CARCHIVE,
MENU_SETTING_CATEGORY,
MENU_SETTING_SUBCATEGORY,
MENU_SETTINGS,
MENU_SETTING_DRIVER,
MENU_SETTING_ACTION,
} menu_file_type_t;
typedef enum

2
frontend/menu/menu_entries.c
View File

@ -114,7 +114,7 @@ int setting_set_flags(rarch_setting_t *setting)
if (setting->flags & SD_FLAG_ALLOW_INPUT)
return MENU_FILE_LINEFEED;
if (setting->flags & SD_FLAG_PUSH_ACTION)
return MENU_FILE_PUSH;
return MENU_SETTING_ACTION;
if (setting->flags & SD_FLAG_IS_DRIVER)
return MENU_SETTING_DRIVER;
if (setting->type == ST_PATH)

16
frontend/menu/menu_entries_cbs.c
View File

@ -931,7 +931,7 @@ static int action_ok_shader_preset_parameters(const char *path,
driver.menu->menu_list,
"",
"video_shader_preset_parameters",
MENU_FILE_PUSH,
MENU_SETTING_ACTION,
driver.menu->selection_ptr);
#endif
@ -946,7 +946,7 @@ static int action_ok_shader_parameters(const char *path,
driver.menu->menu_list,
"",
"video_shader_parameters",
MENU_FILE_PUSH,
MENU_SETTING_ACTION,
driver.menu->selection_ptr);
#endif
@ -1258,9 +1258,9 @@ static int deferred_push_performance_counters(void *data, void *userdata,
menu_list_clear(list);
menu_list_push(list, "Frontend Counters", "frontend_counters",
MENU_FILE_PUSH, 0);
MENU_SETTING_ACTION, 0);
menu_list_push(list, "Core Counters", "core_counters",
MENU_FILE_PUSH, 0);
MENU_SETTING_ACTION, 0);
if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(driver.menu, path, label, type);
@ -1430,17 +1430,17 @@ static int deferred_push_shader_options(void *data, void *userdata,
menu_list_clear(list);
menu_list_push(list, "Apply Shader Changes", "shader_apply_changes",
MENU_FILE_PUSH, 0);
MENU_SETTING_ACTION, 0);
menu_list_push(list, "Default Filter", "video_shader_default_filter",
0, 0);
menu_list_push(list, "Load Shader Preset", "video_shader_preset",
MENU_FILE_PUSH, 0);
MENU_SETTING_ACTION, 0);
menu_list_push(list, "Shader Preset Save As",
"video_shader_preset_save_as", MENU_FILE_LINEFEED_SWITCH, 0);
menu_list_push(list, "Parameters (Current)",
"video_shader_parameters", MENU_FILE_PUSH, 0);
"video_shader_parameters", MENU_SETTING_ACTION, 0);
menu_list_push(list, "Parameters (Menu)",
"video_shader_preset_parameters", MENU_FILE_PUSH, 0);
"video_shader_preset_parameters", MENU_SETTING_ACTION, 0);
menu_list_push(list, "Shader Passes", "video_shader_num_passes",
0, 0);