Update menu_entries_prepend

This commit is contained in:
twinaphex 2016-06-17 14:54:29 +02:00
parent b872260bf3
commit 4ec1a9e337
5 changed files with 17 additions and 5 deletions

View File

@ -26,6 +26,8 @@ static const char *menu_hash_to_str_us_label_enum(enum menu_hash_enums msg)
{
switch (msg)
{
case MENU_ENUM_LABEL_PARENT_DIRECTORY:
return "parent_directory";
case MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE:
return "input_player%u_analog_dpad_mode";
case MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE:
@ -834,6 +836,8 @@ const char *menu_hash_to_str_us_enum(enum menu_hash_enums msg)
switch (msg)
{
case MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY:
return "..";
case MENU_ENUM_LABEL_VALUE_RUN:
return "Run";
case MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X:

View File

@ -3117,12 +3117,14 @@ static int menu_displaylist_parse_generic(
menu_entries_prepend(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY),
menu_hash_to_str_enum(MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY),
MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY,
MENU_FILE_SCAN_DIRECTORY, 0 ,0);
if (push_dir)
menu_entries_prepend(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY),
menu_hash_to_str_enum(MENU_ENUM_LABEL_USE_THIS_DIRECTORY),
MENU_ENUM_LABEL_USE_THIS_DIRECTORY,
MENU_FILE_USE_DIRECTORY, 0 ,0);
if (!horizontal && hash_label != MENU_LABEL_CORE_LIST)
@ -3132,7 +3134,10 @@ static int menu_displaylist_parse_generic(
if (!string_is_empty(out_dir))
{
menu_entries_prepend(info->list, "..", info->path,
menu_entries_prepend(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY),
info->path,
MENU_ENUM_LABEL_PARENT_DIRECTORY,
MENU_FILE_PARENT_DIRECTORY, 0, 0);
}
}

View File

@ -576,6 +576,7 @@ void menu_entries_add_enum(file_list_t *list, const char *path, const char *labe
}
void menu_entries_prepend(file_list_t *list, const char *path, const char *label,
enum menu_hash_enums enum_idx,
unsigned type, size_t directory_ptr, size_t entry_idx)
{
menu_ctx_list_t list_info;
@ -604,10 +605,8 @@ void menu_entries_prepend(file_list_t *list, const char *path, const char *label
file_list_set_actiondata(list, idx, cbs);
if (cbs->enum_idx == MENU_ENUM_LABEL_UNKNOWN)
cbs->setting = menu_setting_find(label);
else
cbs->setting = menu_setting_find_enum(cbs->enum_idx);
cbs->enum_idx = enum_idx;
cbs->setting = menu_setting_find_enum(cbs->enum_idx);
menu_cbs_init(list, cbs, path, label, type, idx);
}

View File

@ -175,6 +175,7 @@ void menu_entries_set_alt_at_offset(file_list_t *list, size_t idx,
rarch_setting_t *menu_entries_get_setting(uint32_t i);
void menu_entries_prepend(file_list_t *list, const char *path, const char *label,
enum menu_hash_enums enum_idx,
unsigned type, size_t directory_ptr, size_t entry_idx);
void menu_entries_add_enum(file_list_t *list, const char *path, const char *label,

View File

@ -43,6 +43,9 @@ enum menu_hash_enums
MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY,
MENU_ENUM_LABEL_PARENT_DIRECTORY,
MENU_ENUM_LABEL_RUN,
MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD,