From abaff9c90e5c6c3cd2fece3896d20fe59e06e6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E5=8D=A1?= <lvka@guanghetv.com>
Date: Tue, 26 Jul 2022 21:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BC=A9=E6=94=BE=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=94=A8=E6=9D=A5=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=AB=8B=E5=88=BB=E7=BC=A9=E6=94=BE=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/src/main/java/com/otaliastudios/zoom/ZoomApi.kt   | 8 ++++----
 .../src/main/java/com/otaliastudios/zoom/ZoomEngine.kt    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/src/main/java/com/otaliastudios/zoom/ZoomApi.kt b/library/src/main/java/com/otaliastudios/zoom/ZoomApi.kt
index c89b9a8..ae30609 100644
--- a/library/src/main/java/com/otaliastudios/zoom/ZoomApi.kt
+++ b/library/src/main/java/com/otaliastudios/zoom/ZoomApi.kt
@@ -418,7 +418,7 @@ interface ZoomApi {
      *
      * @param maxZoom the max zoom
      */
-    fun setMaxZoom(@Zoom maxZoom: Float) {
+    fun setMaxZoom(@Zoom maxZoom: Float,scaleView:Boolean = true) {
         setMaxZoom(maxZoom, TYPE_ZOOM)
     }
 
@@ -432,7 +432,7 @@ interface ZoomApi {
      * @see zoom
      * @see realZoom
      */
-    fun setMaxZoom(maxZoom: Float, @ZoomType type: Int)
+    fun setMaxZoom(maxZoom: Float, @ZoomType type: Int,scaleView:Boolean = true)
 
     /**
      * Get the currently allowed min zoom.
@@ -459,7 +459,7 @@ interface ZoomApi {
      *
      * @param minZoom the min zoom
      */
-    fun setMinZoom(@Zoom minZoom: Float) {
+    fun setMinZoom(@Zoom minZoom: Float,scaleView:Boolean = true) {
         setMinZoom(minZoom, TYPE_ZOOM)
     }
 
@@ -473,7 +473,7 @@ interface ZoomApi {
      * @see zoom
      * @see realZoom
      */
-    fun setMinZoom(minZoom: Float, @ZoomType type: Int)
+    fun setMinZoom(minZoom: Float, @ZoomType type: Int,scaleView:Boolean = true)
 
     /**
      * Sets the duration of animations triggered by zoom and pan APIs.
diff --git a/library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt b/library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt
index bf6d062..a81adf7 100644
--- a/library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt
+++ b/library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt
@@ -854,9 +854,9 @@ constructor(context: Context) : ZoomApi {
      *
      * @see ZoomApi.TYPE_REAL_ZOOM
      */
-    override fun setMaxZoom(maxZoom: Float, @ZoomType type: Int) {
+    override fun setMaxZoom(maxZoom: Float, @ZoomType type: Int,scaleView:Boolean) {
         zoomManager.setMaxZoom(maxZoom, type)
-        if (zoom > zoomManager.getMaxZoom()) {
+        if (zoom > zoomManager.getMaxZoom() && scaleView) {
             realZoomTo(zoomManager.getMaxZoom(), animate = true)
         }
     }
@@ -889,9 +889,9 @@ constructor(context: Context) : ZoomApi {
      * @see ZoomApi.zoom
      * @see ZoomApi.realZoom
      */
-    override fun setMinZoom(minZoom: Float, @ZoomType type: Int) {
+    override fun setMinZoom(minZoom: Float, @ZoomType type: Int,scaleView:Boolean = true) {
         zoomManager.setMinZoom(minZoom, type)
-        if (realZoom <= zoomManager.getMinZoom()) {
+        if (realZoom <= zoomManager.getMinZoom() && scaleView) {
             realZoomTo(zoomManager.getMinZoom(), animate = true)
         }
     }