commit fb49e85bf6723abb901e1b1962594a3db1b42a75
author Sylvain Becker <sylvain.becker@gmail.com> Tue Apr 02 17:18:47 2019 +0200
committer Sylvain Becker <sylvain.becker@gmail.com> Tue Apr 02 17:18:47 2019 +0200
tree f90b69bf12263004d24e2a5a78bd6ba4d7515e9f
parent d29be585041cae300d592444b35934db06f59168

Bug 4576: remove touch/mouse duplication for IOS

src/video/uikit/SDL_uikitview.m

diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index d1f72d0..3945953 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -41,8 +41,6 @@
 
     SDL_TouchID directTouchId;
     SDL_TouchID indirectTouchId;
-
-    UITouch * __weak firstFingerDown;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -218,18 +216,7 @@
             continue;
         }
 
-        if (!firstFingerDown) {
-            CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
-            int clicks = (int) touch.tapCount;
-
-            /* send mouse moved event */
-            SDL_SendMouseMotion(sdlwindow, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
-
-            /* send mouse down event */
-            SDL_SendMouseButtonClicks(sdlwindow, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT, clicks);
-
-            firstFingerDown = touch;
-        }
+        /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
 
         CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
         SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch),
@@ -248,12 +235,7 @@
             continue;
         }
 
-        if (touch == firstFingerDown) {
-            /* send mouse up */
-            int clicks = (int) touch.tapCount;
-            SDL_SendMouseButtonClicks(sdlwindow, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT, clicks);
-            firstFingerDown = nil;
-        }
+        /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
 
         CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
         SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch),
@@ -277,13 +259,6 @@
             continue;
         }
 
-        if (touch == firstFingerDown) {
-            CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
-
-            /* send moved event */
-            SDL_SendMouseMotion(sdlwindow, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
-        }
-
         CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
         SDL_SendTouchMotion(touchId, (SDL_FingerID)((size_t)touch),
                             locationInView.x, locationInView.y, pressure);