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

Some more cleanups

Browse Source
This commit is contained in:
twinaphex 2015-12-10 15:23:43 +01:00
parent 14427dd725
commit a173b5a2bb
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/drivers/materialui.c
View File

@ -640,6 +640,7 @@ static void mui_draw_cursor(mui_handle_t *mui,
static size_t mui_list_get_size(void *data, menu_list_type_t type)
{
size_t list_size = 0;
(void)data;
switch (type)
{
@ -815,7 +816,7 @@ static void mui_frame(void)
mui->tabs_height = 0;
/* display tabs if depth equal one, if not hide them */
if (mui_list_get_size(menu, MENU_LIST_PLAIN) == 1)
if (mui_list_get_size(mui, MENU_LIST_PLAIN) == 1)
{
mui_draw_tab_begin(mui, width, height, &white_bg[0], &grey_bg[0]);

25
menu/drivers/xmb.c
View File

@ -265,8 +265,7 @@ static size_t xmb_list_get_selection(void *data)
static size_t xmb_list_get_size(void *data, menu_list_type_t type)
{
size_t list_size = 0;
menu_handle_t *menu = (menu_handle_t*)data;
xmb_handle_t *xmb = menu ? (xmb_handle_t*)menu->userdata : NULL;
xmb_handle_t *xmb = (xmb_handle_t*)data;
switch (type)
{
@ -594,7 +593,7 @@ static void xmb_selection_pointer_changed(bool allow_animations)
ia = XMB_ITEM_ACTIVE_ALPHA;
iz = XMB_ITEM_ACTIVE_ZOOM;
depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN);
if (settings->menu.boxart_enable && depth == 1)
{
xmb_update_boxart_path(xmb, i);
@ -895,7 +894,7 @@ static xmb_node_t* xmb_get_node(xmb_handle_t *xmb, unsigned i)
static void xmb_list_switch_horizontal_list(xmb_handle_t *xmb, menu_handle_t *menu)
{
unsigned j;
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
for (j = 0; j <= list_size; j++)
{
@ -963,7 +962,7 @@ static void xmb_list_switch(xmb_handle_t *xmb)
static void xmb_list_open_horizontal_list(xmb_handle_t *xmb, menu_handle_t *menu)
{
unsigned j;
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
for (j = 0; j <= list_size; j++)
{
@ -987,7 +986,7 @@ static void xmb_context_destroy_horizontal_list(xmb_handle_t *xmb,
menu_handle_t *menu)
{
unsigned i;
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL);
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL);
for (i = 0; i < list_size; i++)
{
@ -1028,7 +1027,7 @@ static void xmb_init_horizontal_list(menu_handle_t *menu, xmb_handle_t *xmb)
static void xmb_toggle_horizontal_list(xmb_handle_t *xmb, menu_handle_t *menu)
{
unsigned i;
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
for (i = 0; i <= list_size; i++)
{
@ -1055,7 +1054,7 @@ static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb,
{
unsigned i;
int depth; /* keep this integer */
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL);
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL);
xmb->categories.x_pos = xmb->icon.spacing.horizontal *
-(float)xmb->categories.selection_ptr;
@ -1172,7 +1171,7 @@ static void xmb_list_open(xmb_handle_t *xmb)
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return;
xmb->depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
xmb->depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN);
if (xmb->depth > xmb->old_depth)
dir = 1;
@ -1617,7 +1616,7 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb,
float *color)
{
unsigned i;
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
for (i = 0; i <= list_size; i++)
{
@ -1721,7 +1720,7 @@ static void xmb_frame(void)
height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT,
width, height);
depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN);
xmb_draw_items(xmb,
xmb->selection_buf_old,
@ -2449,7 +2448,7 @@ static void xmb_list_cache(menu_list_type_t type, unsigned action)
xmb_list_deep_copy(menu_stack, xmb->menu_stack_old);
xmb->selection_ptr_old = selection;
list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL) + XMB_SYSTEM_TAB_END;
switch (type)
{
@ -2562,7 +2561,7 @@ static void xmb_toggle(bool menu_on)
if (!xmb)
return;
xmb->depth = xmb_list_get_size(menu, MENU_LIST_PLAIN);
xmb->depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN);
if (!menu_on)
{

2
menu/menu_driver.c
View File

@ -216,7 +216,7 @@ size_t menu_driver_list_get_size(menu_list_type_t type)
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver && driver->list_get_size)
return driver->list_get_size(menu, type);
return driver->list_get_size(menu->userdata, type);
return 0;
}