mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB) Expand xmb_list_get_size

Browse Source
This commit is contained in:
Twinaphex 2015-06-07 14:33:33 +02:00
parent fa0f710b1c
commit 352a5937d9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/drivers/xmb.c
View File

@ -240,6 +240,8 @@ static size_t xmb_list_get_size(void *data, menu_list_type_t type)
switch (type) switch (type)
{ {
case MENU_LIST_PLAIN: case MENU_LIST_PLAIN:
if (menu && menu->menu_list)
file_list_get_size(menu->menu_list->menu_stack);
break; break;
case MENU_LIST_HORIZONTAL: case MENU_LIST_HORIZONTAL:
if (xmb && xmb->core_list) if (xmb && xmb->core_list)
@ -884,7 +886,7 @@ static void xmb_list_open(xmb_handle_t *xmb)
if (!menu) if (!menu)
return; return;
xmb->depth = file_list_get_size(menu->menu_list->menu_stack); xmb->depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
if (xmb->depth > xmb->old_depth) if (xmb->depth > xmb->old_depth)
dir = 1; dir = 1;
@ -1347,7 +1349,7 @@ static void xmb_frame(void)
height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT); height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT);
} }
depth = file_list_get_size(menu->menu_list->menu_stack); depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
xmb_draw_items(xmb, gl, xmb_draw_items(xmb, gl,
xmb->selection_buf_old, xmb->selection_buf_old,
@ -1621,14 +1623,14 @@ static bool xmb_load_image(void *data, menu_image_type_t type)
} }
static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb, static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb,
const char *themepath) menu_handle_t *menu, const char *themepath)
{ {
char iconpath[PATH_MAX_LENGTH]; char iconpath[PATH_MAX_LENGTH];
unsigned i; unsigned i;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
core_info_list_t *info_list = global ? core_info_list_t *info_list = global ?
(core_info_list_t*)global->core_info : NULL; (core_info_list_t*)global->core_info : NULL;
size_t list_size = file_list_get_size(xmb->core_list); size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL);
if (!info_list) if (!info_list)
return; return;
@ -1857,7 +1859,7 @@ static void xmb_context_reset(void)
xmb_context_reset_textures(xmb, iconpath); xmb_context_reset_textures(xmb, iconpath);
xmb_context_reset_background(iconpath); xmb_context_reset_background(iconpath);
xmb_context_reset_horizontal_list(xmb, themepath); xmb_context_reset_horizontal_list(xmb, menu, themepath);
} }
static void xmb_navigation_clear(bool pending_push) static void xmb_navigation_clear(bool pending_push)
@ -2079,7 +2081,7 @@ static void xmb_toggle(bool menu_on)
if (!xmb) if (!xmb)
return; return;
xmb->depth = file_list_get_size(menu->menu_list->menu_stack); xmb->depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
if (!menu_on) if (!menu_on)
{ {