(Menu) Update function

This commit is contained in:
Twinaphex 2015-05-05 22:21:38 +02:00
parent db60ee629d
commit f3a7252ea8
5 changed files with 14 additions and 8 deletions

View File

@ -307,8 +307,9 @@ static void glui_render_menu_list(runloop_t *runloop,
unsigned type = 0;
unsigned w = 0;
bool selected = false;
menu_file_list_cbs_t *cbs = NULL;
menu_display_setting_label(i,
menu_display_setting_label(cbs, i,
&w, &type,
label,
type_str, sizeof(type_str),

View File

@ -495,8 +495,11 @@ static void rgui_render(void)
unsigned type = 0;
unsigned w = 0;
bool selected = false;
menu_file_list_cbs_t *cbs = NULL;
menu_display_setting_label(i,
menu_display_setting_label(
cbs,
i,
&w, &type,
label,
type_str, sizeof(type_str),

View File

@ -1009,6 +1009,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
xmb_node_t *node = (xmb_node_t*)file_list_get_userdata_at_offset(list, i);
runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
menu_file_list_cbs_t *cbs = NULL;
if (!node)
continue;
@ -1024,7 +1025,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
icon_y > global->video_data.height + xmb->icon.size)
continue;
menu_display_setting_label(i,
menu_display_setting_label(cbs, i,
&w, &type,
label,
type_str, sizeof(type_str),

View File

@ -208,7 +208,9 @@ void menu_display_unset_viewport(menu_handle_t *menu)
global->video_data.height, false, true);
}
menu_file_list_cbs_t *menu_display_setting_label(unsigned i,
void menu_display_setting_label(
menu_file_list_cbs_t *cbs,
unsigned i,
unsigned *w, unsigned *type,
const char *label,
char *type_str, size_t sizeof_type_str,
@ -218,7 +220,6 @@ menu_file_list_cbs_t *menu_display_setting_label(unsigned i,
void *userdata)
{
const char *path = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
file_list_t *list = userdata ? (file_list_t*)userdata
: menu->menu_list->selection_buf;
@ -238,6 +239,4 @@ menu_file_list_cbs_t *menu_display_setting_label(unsigned i,
if (entry_label && entry_label_buf != NULL)
strlcpy(entry_label_buf, entry_label, sizeof_entry_label_buf);
return cbs;
}

View File

@ -53,7 +53,9 @@ void menu_display_set_viewport(menu_handle_t *menu);
void menu_display_unset_viewport(menu_handle_t *menu);
menu_file_list_cbs_t *menu_display_setting_label(unsigned i,
void menu_display_setting_label(
menu_file_list_cbs_t *cbs,
unsigned i,
unsigned *w, unsigned *type,
const char *label,
char *type_str, size_t sizeof_type_str,