CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-01 17:23:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update menu_displaylist_deferred_push

Browse Source
This commit is contained in:
twinaphex 2015-05-13 13:54:14 +02:00
parent 27c0a098a8
commit 47c6792cb9
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/menu_displaylist.c
View File

@ -1996,28 +1996,24 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
int menu_displaylist_deferred_push(menu_displaylist_info_t *info)
{
unsigned type = 0;
const char *path = NULL;
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!info->list)
return -1;
menu_list_get_last_stack(menu->menu_list, &path, &label, &type);
if (!strcmp(label, "Main Menu"))
return menu_entries_push_list(menu, info->list, path, label, type,
if (!strcmp(info->label, "Main Menu"))
return menu_entries_push_list(menu, info->list,
info->path, info->label, info->type,
SL_FLAG_MAIN_MENU);
else if (!strcmp(label, "Horizontal Menu"))
return menu_entries_push_horizontal_menu_list(menu, info->list, path, label, type);
else if (!strcmp(info->label, "Horizontal Menu"))
return menu_entries_push_horizontal_menu_list(menu, info->list, info->path, info->label, info->type);
cbs = (menu_file_list_cbs_t*)
menu_list_get_last_stack_actiondata(menu->menu_list);
if (cbs->action_deferred_push)
return cbs->action_deferred_push(info->list, info->menu_list, path, label, type);
return cbs->action_deferred_push(info->list, info->menu_list, info->path, info->label, info->type);
return 0;
}
@ -2025,12 +2021,20 @@ int menu_displaylist_deferred_push(menu_displaylist_info_t *info)
int menu_displaylist_push(file_list_t *list, file_list_t *menu_list)
{
int ret;
unsigned type = 0;
const char *path = NULL;
const char *label = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
menu_displaylist_info_t info = {0};
menu_list_get_last_stack(menu->menu_list, &path, &label, &type);
info.list = list;
info.menu_list = menu_list;
info.type = type;
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
ret = menu_displaylist_deferred_push(&info);

8
ui/drivers/cocoa/cocoatouch_menu.m
View File

@ -773,6 +773,9 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
- (void)menuRefresh
{
menu_displaylist_info_t info = {0};
unsigned type = 0;
const char *path = NULL;
const char *label = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list)
@ -780,8 +783,13 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
if (!menu->need_refresh)
return;
menu_list_get_last_stack(menu->menu_list, &path, &label, &type);
info.list = menu_list->selection_buf;
info.menu_list = menu_list->menu_stack;
info.type = type;
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
menu_displaylist_deferred_push(&info);
menu->need_refresh = false;