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

Refactor some code - use menu_entry_go_back

Browse Source
This commit is contained in:
twinaphex 2016-06-22 01:26:19 +02:00
parent 8a8fadc5b2
commit 735dc822ca
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
menu/menu_input.c
View File

@ -824,13 +824,9 @@ static int menu_input_mouse_frame(
menu_file_list_cbs_t *cbs, menu_entry_t *entry, menu_file_list_cbs_t *cbs, menu_entry_t *entry,
uint64_t input_mouse, unsigned action) uint64_t input_mouse, unsigned action)
{ {
size_t selection;
int ret = 0; int ret = 0;
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection);
if (BIT64_GET(input_mouse, MENU_MOUSE_ACTION_BUTTON_L)) if (BIT64_GET(input_mouse, MENU_MOUSE_ACTION_BUTTON_L))
{ {
menu_ctx_pointer_t point; menu_ctx_pointer_t point;
@ -849,8 +845,7 @@ static int menu_input_mouse_frame(
if (BIT64_GET(input_mouse, MENU_MOUSE_ACTION_BUTTON_R)) if (BIT64_GET(input_mouse, MENU_MOUSE_ACTION_BUTTON_R))
{ {
menu_entries_pop_stack(&selection, 0, 1); menu_entry_go_back();
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &selection);
} }
if (BIT64_GET(input_mouse, MENU_MOUSE_ACTION_WHEEL_DOWN)) if (BIT64_GET(input_mouse, MENU_MOUSE_ACTION_WHEEL_DOWN))
@ -917,11 +912,8 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
/* Back button */ /* Back button */
if ((unsigned)menu_input_mouse_state(MENU_MOUSE_X_AXIS) < header_height) if ((unsigned)menu_input_mouse_state(MENU_MOUSE_X_AXIS) < header_height)
{ return menu_entry_go_back();
menu_entries_pop_stack(&selection, 0, 1);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &selection);
return 0;
}
if ((menu_input->mouse.ptr == selection) && cbs && cbs->action_select) if ((menu_input->mouse.ptr == selection) && cbs && cbs->action_select)
{ {
BIT64_SET(*input_mouse, MENU_MOUSE_ACTION_BUTTON_L_TOGGLE); BIT64_SET(*input_mouse, MENU_MOUSE_ACTION_BUTTON_L_TOGGLE);
@ -1037,7 +1029,6 @@ static int menu_input_pointer_post_iterate(
menu_file_list_cbs_t *cbs, menu_file_list_cbs_t *cbs,
menu_entry_t *entry, unsigned action) menu_entry_t *entry, unsigned action)
{ {
size_t selection;
static bool pointer_oldpressed[2]; static bool pointer_oldpressed[2];
static bool pointer_oldback = false; static bool pointer_oldback = false;
static int16_t start_x = 0; static int16_t start_x = 0;
@ -1051,8 +1042,6 @@ static int menu_input_pointer_post_iterate(
if (!menu_input || !settings) if (!menu_input || !settings)
return -1; return -1;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return -1;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
check_overlay = check_overlay || check_overlay = check_overlay ||
@ -1144,8 +1133,7 @@ static int menu_input_pointer_post_iterate(
if (!pointer_oldback) if (!pointer_oldback)
{ {
pointer_oldback = true; pointer_oldback = true;
menu_entries_pop_stack(&selection, 0, 1); menu_entry_go_back();
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &selection);
} }
} }