From aae87d16844cf5d208d36013c9bdd9e8cfb438cf Mon Sep 17 00:00:00 2001
From: True Zhuanjia <veimin@foxmail.com>
Date: Tue, 25 Jun 2024 02:08:43 +0800
Subject: [PATCH] fix onscreenControl Stuck

---
 Limelight/Input/CustomTapGestureRecognizer.h |  1 +
 Limelight/Input/CustomTapGestureRecognizer.m | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Limelight/Input/CustomTapGestureRecognizer.h b/Limelight/Input/CustomTapGestureRecognizer.h
index 64578379..f110c70c 100644
--- a/Limelight/Input/CustomTapGestureRecognizer.h
+++ b/Limelight/Input/CustomTapGestureRecognizer.h
@@ -20,6 +20,7 @@
 @property (nonatomic, assign) double tapDownTimeThreshold; // tap down threshold in seconds.
 @property (nonatomic, readonly) CGFloat lowestTouchPointHeight;
 @property (nonatomic, readonly) bool gestureCaptured;
+@property (nonatomic, readonly) bool areVirtualControllerTaps;
 @property (nonatomic, readonly) NSTimeInterval gestureCapturedTime;
 
 @end
diff --git a/Limelight/Input/CustomTapGestureRecognizer.m b/Limelight/Input/CustomTapGestureRecognizer.m
index 5f03eaea..aa554746 100644
--- a/Limelight/Input/CustomTapGestureRecognizer.m
+++ b/Limelight/Input/CustomTapGestureRecognizer.m
@@ -21,15 +21,18 @@
 @implementation CustomTapGestureRecognizer
 
 static CGFloat screenHeightInPoints;
+static CGFloat screenWidthInPoints;
 
 - (instancetype)initWithTarget:(nullable id)target action:(nullable SEL)action {
     self = [super initWithTarget:target action:action];
     screenHeightInPoints = CGRectGetHeight([[UIScreen mainScreen] bounds]);
+    screenWidthInPoints = CGRectGetWidth([[UIScreen mainScreen] bounds]);
     lowestTouchPointYCoord = 0.0;
     _numberOfTouchesRequired = 3;
     _immediateTriggering = false;
     _tapDownTimeThreshold = 0.3;
     _gestureCaptured = false;
+    _areVirtualControllerTaps = false;
     return self;
 }
 
@@ -41,6 +44,12 @@ static CGFloat screenHeightInPoints;
         for(UITouch *touch in [event allTouches]){
             if(lowestTouchPointYCoord < [touch locationInView:self.view].y) lowestTouchPointYCoord = [touch locationInView:self.view].y;
         }
+        
+        if(_numberOfTouchesRequired == 2){
+            NSArray *twoTouches = [[event allTouches] allObjects];
+            _areVirtualControllerTaps = fabs([twoTouches[1] locationInView:self.view].x - [twoTouches[0] locationInView:self.view].x) > screenWidthInPoints/3;
+        }
+        
         _lowestTouchPointHeight = screenHeightInPoints - lowestTouchPointYCoord;
         if(_immediateTriggering){
             lowestTouchPointYCoord = 0.0; //reset for next recoginition
@@ -61,7 +70,8 @@ static CGFloat screenHeightInPoints;
     if([[event allTouches] count] > _numberOfTouchesRequired) {
         _gestureCaptured = false;
         self.state = UIGestureRecognizerStateFailed;
-    } else if(_gestureCaptured && [[event allTouches] count] == [touches count]){
+    } 
+    else if(_gestureCaptured && [[event allTouches] count] == [touches count] && !_areVirtualControllerTaps){  //must exclude virtual controller taps here to prevent stucked button
         _gestureCaptured = false; //reset for next recognition
         if((CACurrentMediaTime() - _gestureCapturedTime) < _tapDownTimeThreshold){
             lowestTouchPointYCoord = 0.0; //reset for next recognition