godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #78085 from m4gr3d/fix_multitouch_detection_spatial_viewport_3x

Browse Source 
[3.x] Fix spatial viewport multitouch detection support
This commit is contained in:
Fredia Huya-Kouadio
2023-06-11 18:08:30 -07:00
committed by GitHub
parent b3396b093b 8f44765831
commit f3026c2aa0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
View File

@@ -228,7 +228,7 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
val x = terminusEvent.x val x = terminusEvent.x
val y = terminusEvent.y 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) GodotLib.pan(x, y, distanceX / 5f, distanceY / 5f)
} else if (!scaleInProgress) { } else if (!scaleInProgress) {
dragInProgress = true dragInProgress = true
@@ -238,7 +238,7 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
} }
override fun onScale(detector: ScaleGestureDetector): Boolean { override fun onScale(detector: ScaleGestureDetector): Boolean {
if (!panningAndScalingEnabled || pointerCaptureInProgress) { if (!panningAndScalingEnabled || pointerCaptureInProgress || dragInProgress) {
return false return false
} }
@@ -253,7 +253,7 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
} }
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
if (!panningAndScalingEnabled || pointerCaptureInProgress) { if (!panningAndScalingEnabled || pointerCaptureInProgress || dragInProgress) {
return false return false
} }
scaleInProgress = true scaleInProgress = true