Skip to content

Commit cd81a91

Browse files
committed
Revert "(GLUI) No need to double tap more" - Needs more
polishment before we can merge this This reverts commit 24840c8.
1 parent 56f273b commit cd81a91

1 file changed

Lines changed: 4 additions & 15 deletions

File tree

menu/menu_input.c

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -840,17 +840,6 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
840840
return 0;
841841
}
842842

843-
static int pointer_highlight(menu_file_list_cbs_t *cbs,
844-
menu_entry_t *entry, unsigned action)
845-
{
846-
menu_input_t *menu_input = menu_input_get_ptr();
847-
menu_navigation_t *nav = menu_navigation_get_ptr();
848-
849-
menu_navigation_set(nav, menu_input->pointer.ptr, false);
850-
851-
return 0;
852-
}
853-
854843
static int pointer_tap(menu_file_list_cbs_t *cbs,
855844
menu_entry_t *entry, unsigned action)
856845
{
@@ -866,8 +855,10 @@ static int pointer_tap(menu_file_list_cbs_t *cbs,
866855
(setting->type == ST_BOOL || setting->type == ST_UINT
867856
|| setting->type == ST_FLOAT || setting->type == ST_STRING))
868857
return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_RIGHT);
869-
else
858+
else if (menu_input->pointer.ptr == nav->selection_ptr)
870859
return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_OK);
860+
else
861+
menu_navigation_set(nav, menu_input->pointer.ptr, false);
871862

872863
return 0;
873864
}
@@ -893,15 +884,13 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
893884

894885
if (menu_input->pointer.pressed[0])
895886
{
896-
if (!menu_input->pointer.oldpressed[0] && !menu_input->pointer.dragging)
887+
if (!menu_input->pointer.oldpressed[0])
897888
{
898889
menu_input->pointer.start_x = menu_input->pointer.x;
899890
menu_input->pointer.start_y = menu_input->pointer.y;
900891
menu_input->pointer.old_x = menu_input->pointer.x;
901892
menu_input->pointer.old_y = menu_input->pointer.y;
902893
menu_input->pointer.oldpressed[0] = true;
903-
if ((unsigned)menu_input->pointer.start_y > disp->header_height)
904-
ret = pointer_highlight(cbs, entry, action);
905894
}
906895
else if (abs(menu_input->pointer.x - menu_input->pointer.start_x) > 3
907896
|| abs(menu_input->pointer.y - menu_input->pointer.start_y) > 3)

0 commit comments

Comments
 (0)