len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-06 21:25:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

touchscreen: Fix seeking to end of track in WPS

Browse source 
Seeking to the very end of the track with the touchscreen caused
rapid skipping through the playlist because each touch event
generates a separate seek operation, kind of like rapidly pressing
a physical button. Fix this bug by executing the seek operation
only for the release event.

Change-Id: Ic1080065a68e7cc2ba98e2f27293c954f2ec8fb2
This commit is contained in:
Aidan MacDonald 2022-07-28 21:07:16 +01:00
parent 010d22ed29
commit 02ad19c959
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/action.h
View file

@ -303,6 +303,8 @@ enum {
ACTION_TOUCH_REPMODE, ACTION_TOUCH_REPMODE,
ACTION_TOUCH_MUTE, ACTION_TOUCH_MUTE,
ACTION_TOUCH_SCROLLBAR, ACTION_TOUCH_SCROLLBAR,
ACTION_TOUCH_SCROLLBAR_SET,
ACTION_TOUCH_SCROLLBAR_END,
ACTION_TOUCH_VOLUME, ACTION_TOUCH_VOLUME,
ACTION_TOUCH_SOFTLOCK, ACTION_TOUCH_SOFTLOCK,
ACTION_TOUCH_SETTING, ACTION_TOUCH_SETTING,

15
apps/gui/skin_engine/skin_touchsupport.c
View file

@ -103,12 +103,12 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
case ACTION_TOUCH_SCROLLBAR: case ACTION_TOUCH_SCROLLBAR:
case ACTION_TOUCH_VOLUME: case ACTION_TOUCH_VOLUME:
case ACTION_TOUCH_SETTING: case ACTION_TOUCH_SETTING:
/* we need something press-like */ /* accept taps and drags, ignore the rest */
if (!(gevent.id == GESTURE_TAP || if (!(gevent.id == GESTURE_TAP ||
gevent.id == GESTURE_LONG_PRESS ||
gevent.id == GESTURE_HOLD || gevent.id == GESTURE_HOLD ||
gevent.id == GESTURE_DRAGSTART || gevent.id == GESTURE_DRAGSTART ||
gevent.id == GESTURE_DRAG)) gevent.id == GESTURE_DRAG ||
gevent.id == GESTURE_RELEASE))
break; break;
if (edge_offset) if (edge_offset)
@ -194,6 +194,15 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
switch (action) switch (action)
{ {
case ACTION_TOUCH_SCROLLBAR:
if (gevent.id == GESTURE_HOLD ||
gevent.id == GESTURE_DRAGSTART ||
gevent.id == GESTURE_DRAG)
action = ACTION_TOUCH_SCROLLBAR_SET;
else if (gevent.id == GESTURE_RELEASE)
action = ACTION_TOUCH_SCROLLBAR_END;
break;
case ACTION_TOUCH_SOFTLOCK: case ACTION_TOUCH_SOFTLOCK:
data->touchscreen_locked = !data->touchscreen_locked; data->touchscreen_locked = !data->touchscreen_locked;
action = ACTION_NONE; action = ACTION_NONE;

7
apps/gui/wps.c
View file

@ -193,6 +193,13 @@ static int skintouch_to_wps(void)
case ACTION_STD_HOTKEY: case ACTION_STD_HOTKEY:
return ACTION_WPS_HOTKEY; return ACTION_WPS_HOTKEY;
#endif #endif
case ACTION_TOUCH_SCROLLBAR_SET:
audio_pre_ff_rewind();
gstate->id3->elapsed = gstate->id3->length*offset/1000;
return ACTION_TOUCHSCREEN;
case ACTION_TOUCH_SCROLLBAR_END:
audio_ff_rewind(gstate->id3->elapsed);
return ACTION_TOUCHSCREEN;
case ACTION_TOUCH_SCROLLBAR: case ACTION_TOUCH_SCROLLBAR:
gstate->id3->elapsed = gstate->id3->length*offset/1000; gstate->id3->elapsed = gstate->id3->length*offset/1000;
audio_pre_ff_rewind(); audio_pre_ff_rewind();