From b9c7e0a8ca91a8986bf3773dab332d187bff2e1c Mon Sep 17 00:00:00 2001
From: Koen <koen@pop-os.localdomain>
Date: Tue, 16 Jan 2024 12:05:04 +0100
Subject: [PATCH] Made snapping only work when panned close to center.

---
 .../platformplayer/views/behavior/GestureControlView.kt  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt b/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt
index 5668a89a..e6779b12 100644
--- a/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt
@@ -9,7 +9,6 @@ import android.graphics.Matrix
 import android.graphics.drawable.Animatable
 import android.media.AudioManager
 import android.util.AttributeSet
-import android.util.Log
 import android.view.GestureDetector
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -291,8 +290,6 @@ class GestureControlView : LinearLayout {
         _translationY = translationY.coerceAtLeast(ymin).coerceAtMost(ymax)
 
         onPan.emit(_translationX, _translationY)
-
-        Log.i(TAG, "surfaceView (width: ${_surfaceView?.width}, height: ${_surfaceView?.height}, x: ${_surfaceView?.x}, y: ${_surfaceView?.y}")
     }
 
     fun setupTouchArea(layoutControls: ViewGroup? = null, background: View? = null) {
@@ -382,11 +379,10 @@ class GestureControlView : LinearLayout {
     }
 
     private fun willSnapFill(): Boolean {
-        //TODO: Make sure pan is not too far away from 0, 0
         val surfaceView = _surfaceView
         if (surfaceView != null) {
             val zoomScaleFactor = calculateZoomScaleFactor()
-            if (Math.abs(_scaleFactor - zoomScaleFactor) < 0.05f) {
+            if (Math.abs(_scaleFactor - zoomScaleFactor) < 0.05f && Math.abs(_translationX) / width < 0.03f && Math.abs(_translationY) / height < 0.03f) {
                 return true
             }
         }
@@ -395,8 +391,7 @@ class GestureControlView : LinearLayout {
     }
 
     private fun willSnapFit(): Boolean {
-        //TODO: Make sure pan is not too far away from 0, 0
-        return Math.abs(_scaleFactor - 1.0f) < 0.05f
+        return Math.abs(_scaleFactor - 1.0f) < 0.05f && Math.abs(_translationX) / width < 0.03f && Math.abs(_translationY) / height < 0.03f
     }
 
     fun cancelHideJob() {