Merge pull request #329 from SimFG/SetZoomOpt

SetZoom update the method to calculate the trans
MikeOrtiz · Mar 5, 2021 · 7cacf2d · 7cacf2d
2 parents c50c942 + bc7b506
commit 7cacf2d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/touchview/src/main/java/com/ortiz/touchview/TouchImageView.kt b/touchview/src/main/java/com/ortiz/touchview/TouchImageView.kt
@@ -405,8 +405,8 @@ open class TouchImageView @JvmOverloads constructor(context: Context, attrs: Att
         resetZoom()
         scaleImage(scale.toDouble(), viewWidth / 2.toFloat(), viewHeight / 2.toFloat(), true)
         touchMatrix!!.getValues(floatMatrix)
-        floatMatrix!![Matrix.MTRANS_X] = -(focusX * imageWidth - viewWidth * 0.5f)
-        floatMatrix!![Matrix.MTRANS_Y] = -(focusY * imageHeight - viewHeight * 0.5f)
+        floatMatrix!![Matrix.MTRANS_X] = (viewWidth - matchViewWidth) / 2 - focusX * (scale - 1) * matchViewWidth
+        floatMatrix!![Matrix.MTRANS_Y] = (viewHeight - matchViewHeight) / 2 - focusY * (scale - 1) * matchViewHeight
         touchMatrix!!.setValues(floatMatrix)
         fixTrans()
         savePreviousImageValues()