|
@@ -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
|