Commit ecd922b5cf9a6acff91f952b8da3068c776e57a1
2022-02-01T22:33:13
Fix touch holding detection after #5244 changes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/src/video/vita/SDL_vitatouch.c b/src/video/vita/SDL_vitatouch.c
index f28c880..43a3ecb 100644
--- a/src/video/vita/SDL_vitatouch.c
+++ b/src/video/vita/SDL_vitatouch.c
@@ -108,17 +108,30 @@ VITA_PollTouch(void)
float x = 0;
float y = 0;
float force = (touch[port].report[i].force - force_info[port].min) / force_info[port].range;
+ int finger_down = 0;
+
+ if (touch_old[port].reportNum > 0) {
+ for (int j = 0; j < touch_old[port].reportNum; j++) {
+ if (touch[port].report[i].id == touch_old[port].report[j].id ) {
+ finger_down = 1;
+ }
+ }
+ }
+
VITA_ConvertTouchXYToSDLXY(&x, &y, touch[port].report[i].x, touch[port].report[i].y, port);
finger_id = (SDL_FingerID) touch[port].report[i].id;
- // Send an initial touch
- SDL_SendTouch((SDL_TouchID)port,
- finger_id,
- Vita_Window,
- SDL_TRUE,
- x,
- y,
- force);
+ // Skip if finger was already previously down
+ if(!finger_down) {
+ // Send an initial touch
+ SDL_SendTouch((SDL_TouchID)port,
+ finger_id,
+ Vita_Window,
+ SDL_TRUE,
+ x,
+ y,
+ force);
+ }
// Always send the motion
SDL_SendTouchMotion((SDL_TouchID)port,