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

Rename menu_entries_deferred_push to menu_displaylist_deferred_push

Browse Source
This commit is contained in:
twinaphex 2015-05-12 10:28:29 +02:00
parent 7927b7f770
commit cd25f8874a
5 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
menu/menu_displaylist.c
View File

@ -16,12 +16,47 @@
#include "menu.h"
#include "menu_display.h"
#include "menu_entries.h"
#include "menu_displaylist.h"
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,
SL_FLAG_MAIN_MENU);
else if (!strcmp(label, "Horizontal Menu"))
return menu_entries_push_horizontal_menu_list(menu, info->list, path, label, type);
cbs = (menu_file_list_cbs_t*)
menu_list_get_last_stack_actiondata(menu->menu_list);
if (!cbs->action_deferred_push)
return 0;
return cbs->action_deferred_push(info->list, info->menu_list, path, label, type);
}
int menu_displaylist_push(file_list_t *list, file_list_t *menu_list)
{
int ret;
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
int ret = menu_entries_deferred_push(list, menu_list);
menu_displaylist_info_t info = {0};
info.list = list;
info.menu_list = menu_list;
ret = menu_displaylist_deferred_push(&info);
menu->need_refresh = false;

3
menu/menu_displaylist.h
View File

@ -27,12 +27,15 @@ extern "C" {
typedef struct menu_displaylist_info
{
file_list_t *list;
file_list_t *menu_list;
char path[PATH_MAX_LENGTH];
char label[PATH_MAX_LENGTH];
unsigned type;
unsigned flags;
} menu_displaylist_info_t;
int menu_displaylist_deferred_push(menu_displaylist_info_t *info);
int menu_displaylist_push(file_list_t *list, file_list_t *menu_list);
#ifdef __cplusplus

25
menu/menu_entries.c
View File

@ -484,31 +484,6 @@ int menu_entries_parse_list(
return 0;
}
int menu_entries_deferred_push(file_list_t *list, file_list_t *menu_list)
{
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();
menu_list_get_last_stack(menu->menu_list, &path, &label, &type);
if (!strcmp(label, "Main Menu"))
return menu_entries_push_list(menu, list, path, label, type,
SL_FLAG_MAIN_MENU);
else if (!strcmp(label, "Horizontal Menu"))
return menu_entries_push_horizontal_menu_list(menu, list, path, label, type);
cbs = (menu_file_list_cbs_t*)
menu_list_get_last_stack_actiondata(menu->menu_list);
if (!cbs->action_deferred_push)
return 0;
return cbs->action_deferred_push(list, menu_list, path, label, type);
}
/**
* menu_entries_init:
* @menu : Menu handle.

2
menu/menu_entries.h
View File

@ -38,8 +38,6 @@ void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1, const char *menu_label);
int menu_entries_deferred_push(file_list_t *list, file_list_t *menu_list);
/**
* menu_entries_init:
* @menu : Menu handle.

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

@ -25,6 +25,7 @@
#include "../../../input/input_keymaps.h"
#include "../../../input/drivers/cocoa_input.h"
#include "../../../menu/menu_displaylist.h"
#include "../../../menu/menu_entries.h"
#include "../../../menu/menu_navigation.h"
#include "../../../menu/menu_list.h"
@ -769,16 +770,19 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
- (void)menuRefresh
{
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list)
return;
if (!menu->need_refresh)
return;
menu_entries_deferred_push(menu_list->selection_buf,
menu_list->menu_stack);
menu->need_refresh = false;
menu_displaylist_info_t info = {0};
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list)
return;
if (!menu->need_refresh)
return;
info.list = menu_list->selection_buf;
info.menu_list = menu_list->menu_stack;
menu_displaylist_deferred_push(&info);
menu->need_refresh = false;
}
- (void)menuBack