From d7839bbd7d5b6bfa970551cc94ba63095aacb925 Mon Sep 17 00:00:00 2001
From: Eric Warmenhoven <eric@warmenhoven.org>
Date: Fri, 27 Sep 2024 17:36:22 -0400
Subject: [PATCH] iOS: Let RApplication handle touch events when TouchMouse not
 enabled (#17046)

---
 .../MouseEmulation/EmulatorTouchMouse.swift   | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift b/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift
index a2d541ea92..2ba9b71207 100644
--- a/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift
+++ b/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift
@@ -114,13 +114,7 @@ import UIKit
    }
    
    public func touchesBegan(touches: Set<UITouch>, event: UIEvent?) {
-      guard enabled, let touch = touches.first else {
-         if #available(iOS 13.4, *), let _ = touches.first {
-            let isLeftClick=(event?.buttonMask == UIEvent.ButtonMask.button(1))
-            delegate?.handleMouseClick(isLeftClick: isLeftClick, isPressed: true)
-         }
-         return
-      }
+      guard enabled, let touch = touches.first else { return }
       if primaryTouch == nil {
          primaryTouch = TouchInfo(touch: touch, origin: touch.location(in: view), holdState: .wait)
          if touch.tapCount == 2 {
@@ -132,15 +126,7 @@ import UIKit
    }
    
    public func touchesEnded(touches: Set<UITouch>, event: UIEvent?) {
-      guard enabled else {
-         if #available(iOS 13.4, *) {
-            let isLeftClick=(event?.buttonMask == UIEvent.ButtonMask.button(1))
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
-               self?.delegate?.handleMouseClick(isLeftClick: isLeftClick, isPressed: false)
-            }
-         }
-         return
-      }
+      guard enabled else { return }
       for touch in touches {
          if touch == primaryTouch?.touch {
             if touch.tapCount > 0 {
@@ -177,13 +163,7 @@ import UIKit
    }
    
    public func touchesCancelled(touches: Set<UITouch>, event: UIEvent?) {
-      guard enabled else {
-         if #available(iOS 13.4, *) {
-            let isLeftClick=(event?.buttonMask == UIEvent.ButtonMask.button(1))
-            delegate?.handleMouseClick(isLeftClick: isLeftClick, isPressed: false)
-         }
-         return
-      }
+      guard enabled else { return }
       for touch in touches {
          if touch == primaryTouch?.touch {
             endHold()