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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-17 03:19:09 +02:00
parent 64c22de3ae
commit 3a6ada1652
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/menu_driver.c
View File

@ -698,10 +698,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
case RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT:
menu_driver_load_no_content = false;
break;
case RARCH_MENU_CTL_NAVIGATION_SET_LAST:
if (menu_driver_ctx->navigation_set_last)
menu_driver_ctx->navigation_set_last(menu_userdata);
break;
case RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET:
{
size_t *ptr_out = (size_t*)data;
@ -726,17 +722,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_userdata, ptr_out);
}
break;
case RARCH_MENU_CTL_NAVIGATION_CLEAR:
{
bool *pending_push = (bool*)data;
if (!pending_push)
return false;
if (menu_driver_ctx->navigation_clear)
menu_driver_ctx->navigation_clear(
menu_userdata, pending_push);
}
break;
case RARCH_MENU_CTL_LIST_GET_ENTRY:
{
menu_ctx_list_t *list = (menu_ctx_list_t*)data;
@ -1010,9 +995,15 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
break;
case MENU_NAVIGATION_CTL_CLEAR:
{
bool *pending_push = (bool*)data;
menu_navigation_set_selection(0);
menu_driver_navigation_set(true);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_CLEAR, data);
if (pending_push)
if (menu_driver_ctx->navigation_clear)
menu_driver_ctx->navigation_clear(
menu_userdata, pending_push);
}
break;
case MENU_NAVIGATION_CTL_INCREMENT:
@ -1093,7 +1084,9 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
size_t menu_list_size = menu_entries_get_size();
size_t new_selection = menu_list_size - 1;
menu_navigation_set_selection(new_selection);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET_LAST, NULL);
if (menu_driver_ctx->navigation_set_last)
menu_driver_ctx->navigation_set_last(menu_userdata);
}
break;
case MENU_NAVIGATION_CTL_ASCEND_ALPHABET:

2
menu/menu_driver.h
View File

@ -82,8 +82,6 @@ enum rarch_menu_ctl_state
{
RARCH_MENU_CTL_NONE = 0,
RARCH_MENU_CTL_REFRESH,
RARCH_MENU_CTL_NAVIGATION_CLEAR,
RARCH_MENU_CTL_NAVIGATION_SET_LAST,
RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET,
RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET,
RARCH_MENU_CTL_SET_PENDING_QUICK_MENU,