浏览代码

Fix spatial viewport multitouch detection support

Regression introduced by https://github.com/godotengine/godot/pull/77498

(cherry picked from commit 2c050cc17e1fb011c69ba4455431dd2531fce2ae)
Fredia Huya-Kouadio 2 年之前
父节点
当前提交
bbfd9914c7
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt

+ 3 - 3
platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt

@@ -231,7 +231,7 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
 
 		val x = terminusEvent.x
 		val y = terminusEvent.y
-		if (terminusEvent.pointerCount >= 2 && panningAndScalingEnabled && !pointerCaptureInProgress) {
+		if (terminusEvent.pointerCount >= 2 && panningAndScalingEnabled && !pointerCaptureInProgress && !dragInProgress) {
 			GodotLib.pan(x, y, distanceX / 5f, distanceY / 5f)
 		} else if (!scaleInProgress){
 			dragInProgress = true
@@ -241,7 +241,7 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
 	}
 
 	override fun onScale(detector: ScaleGestureDetector): Boolean {
-		if (!panningAndScalingEnabled || pointerCaptureInProgress) {
+		if (!panningAndScalingEnabled || pointerCaptureInProgress || dragInProgress) {
 			return false
 		}
 
@@ -256,7 +256,7 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
 	}
 
 	override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
-		if (!panningAndScalingEnabled || pointerCaptureInProgress) {
+		if (!panningAndScalingEnabled || pointerCaptureInProgress || dragInProgress) {
 			return false
 		}
 		scaleInProgress = true