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

Create MENU_ACTION_SELECT

Browse Source
This commit is contained in:
twinaphex 2015-06-01 07:38:59 +02:00
parent 9437867a8a
commit 12e6a443c7
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
menu/menu_entry.c
View File

@ -391,39 +391,14 @@ int menu_entry_get_current_id(bool use_representation)
// cores and updating the currently displayed menu // cores and updating the currently displayed menu
int menu_entry_select(uint32_t i) int menu_entry_select(uint32_t i)
{ {
int ret = 0;
menu_entry_t entry; menu_entry_t entry;
enum menu_action action = MENU_ACTION_NOOP;
menu_file_list_cbs_t *cbs = NULL;
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
rarch_setting_t *setting = menu_setting_find( rarch_setting_t *setting = menu_setting_find(
menu_list->selection_buf->list[i].label); menu_list->selection_buf->list[i].label);
menu_entry_get(&entry, i, NULL, false); menu_entry_get(&entry, i, NULL, false);
cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, i); return menu_entry_action(&entry, i, MENU_ACTION_SELECT);
if (setting_is_of_path_type(setting))
return 0;
nav->selection_ptr = i;
if ((cbs && cbs->action_ok) || setting_is_of_general_type(setting))
action = MENU_ACTION_OK;
else
{
if (cbs && cbs->action_start)
action = MENU_ACTION_START;
if (cbs && cbs->action_right)
action = MENU_ACTION_RIGHT;
}
if (action != MENU_ACTION_NOOP)
ret = menu_entry_action(&entry, i, action);
rarch_main_data_iterate();
return ret;
} }
int menu_entry_iterate(unsigned action) int menu_entry_iterate(unsigned action)
@ -498,6 +473,10 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
if (cbs && cbs->action_info) if (cbs && cbs->action_info)
ret = cbs->action_info(entry->type, entry->label); ret = cbs->action_info(entry->type, entry->label);
break; break;
case MENU_ACTION_SELECT:
if (cbs && cbs->action_select)
ret = cbs->action_select(entry->path, entry->label, entry->type, i);
break;
case MENU_ACTION_REFRESH: case MENU_ACTION_REFRESH:
if (cbs && cbs->action_refresh) if (cbs && cbs->action_refresh)

1
menu/menu_input.h
View File

@ -36,6 +36,7 @@ typedef enum menu_action
MENU_ACTION_CANCEL, MENU_ACTION_CANCEL,
MENU_ACTION_REFRESH, MENU_ACTION_REFRESH,
MENU_ACTION_INFO, MENU_ACTION_INFO,
MENU_ACTION_SELECT,
MENU_ACTION_START, MENU_ACTION_START,
MENU_ACTION_MESSAGE, MENU_ACTION_MESSAGE,
MENU_ACTION_SCROLL_DOWN, MENU_ACTION_SCROLL_DOWN,