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

Revert "(GLUI) No need to double tap more" - Needs more

Browse Source 
polishment before we can merge this

This reverts commit 24840c8918916a5429b6895e351ce2519ecc5668.
This commit is contained in:
twinaphex 2015-07-15 06:28:54 +02:00
parent 56f273b0b5
commit cd81a91d30
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/menu_input.c
View File

@ -840,17 +840,6 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
return 0; return 0;
} }
static int pointer_highlight(menu_file_list_cbs_t *cbs,
menu_entry_t *entry, unsigned action)
{
menu_input_t *menu_input = menu_input_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_navigation_set(nav, menu_input->pointer.ptr, false);
return 0;
}
static int pointer_tap(menu_file_list_cbs_t *cbs, static int pointer_tap(menu_file_list_cbs_t *cbs,
menu_entry_t *entry, unsigned action) menu_entry_t *entry, unsigned action)
{ {
@ -866,8 +855,10 @@ static int pointer_tap(menu_file_list_cbs_t *cbs,
(setting->type == ST_BOOL || setting->type == ST_UINT (setting->type == ST_BOOL || setting->type == ST_UINT
|| setting->type == ST_FLOAT || setting->type == ST_STRING)) || setting->type == ST_FLOAT || setting->type == ST_STRING))
return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_RIGHT); return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_RIGHT);
else else if (menu_input->pointer.ptr == nav->selection_ptr)
return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_OK); return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_OK);
else
menu_navigation_set(nav, menu_input->pointer.ptr, false);
return 0; return 0;
} }
@ -893,15 +884,13 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
if (menu_input->pointer.pressed[0]) if (menu_input->pointer.pressed[0])
{ {
if (!menu_input->pointer.oldpressed[0] && !menu_input->pointer.dragging) if (!menu_input->pointer.oldpressed[0])
{ {
menu_input->pointer.start_x = menu_input->pointer.x; menu_input->pointer.start_x = menu_input->pointer.x;
menu_input->pointer.start_y = menu_input->pointer.y; menu_input->pointer.start_y = menu_input->pointer.y;
menu_input->pointer.old_x = menu_input->pointer.x; menu_input->pointer.old_x = menu_input->pointer.x;
menu_input->pointer.old_y = menu_input->pointer.y; menu_input->pointer.old_y = menu_input->pointer.y;
menu_input->pointer.oldpressed[0] = true; menu_input->pointer.oldpressed[0] = true;
if ((unsigned)menu_input->pointer.start_y > disp->header_height)
ret = pointer_highlight(cbs, entry, action);
} }
else if (abs(menu_input->pointer.x - menu_input->pointer.start_x) > 3 else if (abs(menu_input->pointer.x - menu_input->pointer.start_x) > 3
|| abs(menu_input->pointer.y - menu_input->pointer.start_y) > 3) || abs(menu_input->pointer.y - menu_input->pointer.start_y) > 3)