libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(XMB) Use MENU_FILE_CONTENTLIST_ENTRY

Browse Source
This commit is contained in:
Jean-André Santoni 2014-11-24 14:43:01 +07:00
parent 42bc5d35ca
commit 33edefb154
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/disp/xmb.c
View File

@ -835,6 +835,9 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
icon = xmb->textures[XMB_TEXTURE_FILE].id; icon = xmb->textures[XMB_TEXTURE_FILE].id;
break; break;
case MENU_FILE_PLAYLIST_ENTRY: case MENU_FILE_PLAYLIST_ENTRY:
icon = xmb->textures[XMB_TEXTURE_FILE].id;
break;
case MENU_FILE_CONTENTLIST_ENTRY:
icon = core_node ? core_node->content_icon : xmb->textures[XMB_TEXTURE_FILE].id; icon = core_node ? core_node->content_icon : xmb->textures[XMB_TEXTURE_FILE].id;
break; break;
case MENU_FILE_CARCHIVE: case MENU_FILE_CARCHIVE:

1
menu/menu_common.h
View File

@ -65,6 +65,7 @@ typedef enum
MENU_FILE_DEVICE, MENU_FILE_DEVICE,
MENU_FILE_CORE, MENU_FILE_CORE,
MENU_FILE_PLAYLIST_ENTRY, MENU_FILE_PLAYLIST_ENTRY,
MENU_FILE_CONTENTLIST_ENTRY,
MENU_FILE_SHADER_PRESET, MENU_FILE_SHADER_PRESET,
MENU_FILE_SHADER, MENU_FILE_SHADER,
MENU_FILE_VIDEOFILTER, MENU_FILE_VIDEOFILTER,

6
menu/menu_entries_cbs.c
View File

@ -1847,7 +1847,7 @@ static void content_list_push(void *data, core_info_t *info, const char* path)
if (list->elems[j].attr.i == RARCH_DIRECTORY) // is a directory if (list->elems[j].attr.i == RARCH_DIRECTORY) // is a directory
content_list_push(flist, info, list->elems[j].data); content_list_push(flist, info, list->elems[j].data);
else else
menu_list_push(flist, path_basename(list->elems[j].data), "", MENU_FILE_PLAYLIST_ENTRY, 0); menu_list_push(flist, path_basename(list->elems[j].data), "", MENU_FILE_CONTENTLIST_ENTRY, 0);
} }
string_list_free(list); string_list_free(list);
@ -1888,7 +1888,7 @@ static int deferred_push_content_list(void *data, void *userdata,
if (!info->supports_no_game) if (!info->supports_no_game)
content_list_push(list, info, g_settings.content_directory); content_list_push(list, info, g_settings.content_directory);
else else
menu_list_push(list, info->display_name, "", MENU_FILE_PLAYLIST_ENTRY, 0); menu_list_push(list, info->display_name, "", MENU_FILE_CONTENTLIST_ENTRY, 0);
driver.menu->scroll_indices_size = 0; driver.menu->scroll_indices_size = 0;
menu_entries_build_scroll_indices(list); menu_entries_build_scroll_indices(list);
@ -2326,7 +2326,7 @@ static void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs,
case MENU_FILE_USE_DIRECTORY: case MENU_FILE_USE_DIRECTORY:
cbs->action_toggle = action_toggle_scroll; cbs->action_toggle = action_toggle_scroll;
break; break;
case MENU_FILE_PLAYLIST_ENTRY: case MENU_FILE_CONTENTLIST_ENTRY:
cbs->action_toggle = action_toggle_mainmenu; cbs->action_toggle = action_toggle_mainmenu;
break; break;
} }