diff options
| author | Sylvain Becker <sylvain.becker@gmail.com> | 2019-04-02 17:18:47 +0200 |
|---|---|---|
| committer | Sylvain Becker <sylvain.becker@gmail.com> | 2019-04-02 17:18:47 +0200 |
| commit | 2c2e438e6c9864ef33faa48ab3416f274ce16a69 (patch) | |
| tree | f90b69bf12263004d24e2a5a78bd6ba4d7515e9f | |
| parent | 68514087918d7d775dfc1b1797667ee81a8ccbc7 (diff) | |
Bug 4576: remove touch/mouse duplication for IOS
| -rw-r--r-- | src/video/uikit/SDL_uikitview.m | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m index d1f72d06fb..39459539f9 100644 --- a/src/video/uikit/SDL_uikitview.m +++ b/src/video/uikit/SDL_uikitview.m @@ -41,8 +41,6 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; SDL_TouchID directTouchId; SDL_TouchID indirectTouchId; - - UITouch * __weak firstFingerDown; } - (instancetype)initWithFrame:(CGRect)frame @@ -218,18 +216,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; 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 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; 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 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; 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); |