[MODIFY] reduce maxinumZoomScale

congnd · Apr 5, 2018 · 3f206ca · 3f206ca
1 parent 9258492
commit 3f206ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/FMPhotoPicker/FMPhotoPicker/source/Scene/Presenter/Editor/Views/Crop/FMCropScrollView.swift b/FMPhotoPicker/FMPhotoPicker/source/Scene/Presenter/Editor/Views/Crop/FMCropScrollView.swift
@@ -73,8 +73,16 @@ class FMCropScrollView: UIScrollView {
             let scaleHeight = scrollViewFrame.size.height / image.size.height
             let minimumScale = min(scaleWidth, scaleHeight)
 
+//            self.minimumZoomScale = minimumScale
+//            self.maximumZoomScale = max(minimumScale, self.maximumZoomScale)
+
             self.minimumZoomScale = minimumScale
-            self.maximumZoomScale = max(minimumScale, self.maximumZoomScale)
+
+            if minimumScale > 1 {
+                self.maximumZoomScale = minimumScale
+            } else {
+                self.maximumZoomScale = min(1, minimumScale * 3)
+            }
 
             self.zoomScale = minimumZoomScale
 

diff --git a/FMPhotoPicker/FMPhotoPicker/source/Scene/Presenter/Viewer/FMScalingImageView.swift b/FMPhotoPicker/FMPhotoPicker/source/Scene/Presenter/Viewer/FMScalingImageView.swift
@@ -111,7 +111,12 @@ class FMScalingImageView: UIScrollView {
             let minimumScale = min(scaleWidth, scaleHeight)
 
             self.minimumZoomScale = minimumScale
-            self.maximumZoomScale = max(minimumScale, self.maximumZoomScale)
+
+            if minimumScale > 1 {
+                self.maximumZoomScale = minimumScale
+            } else {
+                self.maximumZoomScale = min(1, minimumScale * 3)
+            }
 
             self.zoomScale = minimumZoomScale