mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-02 16:19:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add GoogleMaps-like pinching (#12765)

Browse Source 
Co-authored-by: mrimvo <6030346+mrimvo@users.noreply.github.com>
This commit is contained in:
sulai
2025-01-07 19:49:58 +01:00
committed by GitHub
parent 0b2c8148b0
commit 5364ead170
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/com/unciv/ui/components/ZoomGestureListener.kt
View File

@ -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() {}
}

9
core/src/com/unciv/ui/components/widgets/ZoomableScrollPane.kt
View File

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