Add GoogleMaps-like pinching (#12765)

Co-authored-by: mrimvo <[email protected]>
yairm210 · Jan 7, 2025 · 5364ead · 5364ead
1 parent 0b2c814
commit 5364ead
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/core/src/com/unciv/ui/components/ZoomGestureListener.kt b/core/src/com/unciv/ui/components/ZoomGestureListener.kt
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent
 open class ZoomGestureListener(
     halfTapSquareSize: Float, tapCountInterval: Float, longPressDuration: Float, maxFlingDelay: Float
 ) : EventListener {
-    val detector: GestureDetector
-    var event: InputEvent? = null
+
+    private val detector: GestureDetector
 
     constructor() : this(20f, 0.4f, 1.1f, Int.MAX_VALUE.toFloat())
 
@@ -22,22 +22,29 @@ open class ZoomGestureListener(
             maxFlingDelay,
             object : GestureDetector.GestureAdapter() {
 
-                override fun zoom(initialDistance: Float, distance: Float): Boolean {
-                    this@ZoomGestureListener.zoom(initialDistance, distance)
-                    return true
-                }
-
+                private var pinchCenter: Vector2? = null
+                private var initialDistance = 0f
+
                 override fun pinch(
                     stageInitialPointer1: Vector2,
                     stageInitialPointer2: Vector2,
                     stagePointer1: Vector2,
                     stagePointer2: Vector2
                 ): Boolean {
-                    this@ZoomGestureListener.pinch()
+                    if (pinchCenter == null) {
+                        pinchCenter = stageInitialPointer1.cpy().add(stageInitialPointer2).scl(.5f)
+                        initialDistance = stageInitialPointer1.dst(stageInitialPointer2)
+                    }
+                    val currentCenter = stagePointer1.cpy().add(stagePointer2).scl(.5f)
+                    val delta = currentCenter.cpy().sub(pinchCenter)
+                    pinchCenter = currentCenter.cpy()
+                    this@ZoomGestureListener.pinch(delta)
+                    this@ZoomGestureListener.zoom(initialDistance, stagePointer1.dst(stagePointer2))
                     return true
                 }
 
                 override fun pinchStop() {
+                    pinchCenter = null
                     this@ZoomGestureListener.pinchStop()
                 }
             })
@@ -61,12 +68,10 @@ open class ZoomGestureListener(
                     detector.reset()
                     return false
                 }
-                this.event = event
                 detector.touchUp(event.stageX, event.stageY, event.pointer, event.button)
                 return true
             }
             InputEvent.Type.touchDragged -> {
-                this.event = event
                 detector.touchDragged(event.stageX, event.stageY, event.pointer)
                 return true
             }
@@ -79,6 +84,6 @@ open class ZoomGestureListener(
 
     open fun scrolled(amountX: Float, amountY: Float): Boolean { return false }
     open fun zoom(initialDistance: Float, distance: Float) {}
-    open fun pinch() {}
+    open fun pinch(delta: Vector2) {}
     open fun pinchStop() {}
 }
diff --git a/core/src/com/unciv/ui/components/widgets/ZoomableScrollPane.kt b/core/src/com/unciv/ui/components/widgets/ZoomableScrollPane.kt
@@ -246,11 +246,16 @@ open class ZoomableScrollPane(
             }
         }
 
-        override fun pinch() {
+        override fun pinch(delta: Vector2) {
             if (!isZooming) {
                 isZooming = true
                 onZoomStartListener?.invoke()
             }
+            scrollTo(
+                scrollX - delta.x,
+                scrollY + delta.y,
+                true
+            )
         }
 
         override fun pinchStop() {
@@ -317,8 +322,6 @@ open class ZoomableScrollPane(
 
             //clamp() call is missing here but it doesn't seem to make any big difference in this case
 
-            if ((isScrollX && deltaX != 0f || isScrollY && deltaY != 0f))
-                cancelTouchFocus()
         }
 
         override fun panStop(event: InputEvent?, x: Float, y: Float, pointer: Int, button: Int) {