fix: fix “keep zooming” issue (#101)

guoyingtao · Apr 22, 2021 · eacc8ed · eacc8ed
1 parent 7a2b875
commit eacc8ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/Sources/Mantis/CropView/CropView.swift b/Sources/Mantis/CropView/CropView.swift
@@ -424,6 +424,7 @@ extension CropView {
 
     func adjustUIForNewCrop(contentRect:CGRect,
                             animation: Bool = true,
+                            zoom: Bool = true,
                             completion: @escaping ()->Void) {
 
         let scaleX: CGFloat
@@ -467,9 +468,11 @@ extension CropView {
         func updateUI(by newCropBoxFrame: CGRect, and scaleFrame: CGRect) {
             viewModel.cropBoxFrame = newCropBoxFrame
 
-            let zoomRect = convert(scaleFrame,
-                                        to: scrollView.imageContainer)
-            scrollView.zoom(to: zoomRect, animated: false)
+            if zoom {
+                let zoomRect = convert(scaleFrame,
+                                            to: scrollView.imageContainer)
+                scrollView.zoom(to: zoomRect, animated: false)
+            }
             scrollView.checkContentOffset()
             makeSureImageContainsCropOverlay()
         }
@@ -693,12 +696,12 @@ extension CropView {
         rotationDial?.rotateDialPlate(to: CGAngle(radians: radians), animated: false)
     }
 
-    func setFixedRatioCropBox() {
+    func setFixedRatioCropBox(zoom: Bool = true) {
         viewModel.setCropBoxFrame(by: getInitialCropBoxRect(),
                                   and: getImageRatioH())
 
         let contentRect = getContentBounds()
-        adjustUIForNewCrop(contentRect: contentRect, animation: false) { [weak self] in
+        adjustUIForNewCrop(contentRect: contentRect, animation: false, zoom: zoom) { [weak self] in
             guard let self = self else { return }
             if self.forceFixedRatio {
                 self.imageStatusChangedCheckForForceFixedRatio = true

diff --git a/Sources/Mantis/CropViewController/CropViewController.swift b/Sources/Mantis/CropViewController/CropViewController.swift
@@ -216,18 +216,18 @@ public class CropViewController: UIViewController {
     }
 
 
-    func setFixedRatio(_ ratio: Double) {
+    private func setFixedRatio(_ ratio: Double, zoom: Bool = true) {
         cropToolbar.handleFixedRatioSetted(ratio: ratio)
         cropView.aspectRatioLockEnabled = true
 
         if (cropView.viewModel.aspectRatio != CGFloat(ratio)) {
             cropView.viewModel.aspectRatio = CGFloat(ratio)
 
             if case .alwaysUsingOnePresetFixedRatio = config.presetFixedRatioType {
-                self.cropView.setFixedRatioCropBox()
+                self.cropView.setFixedRatioCropBox(zoom: zoom)
             } else {
                 UIView.animate(withDuration: 0.5) {
-                    self.cropView.setFixedRatioCropBox()
+                    self.cropView.setFixedRatioCropBox(zoom: zoom)
                 }
             }
 
@@ -386,7 +386,7 @@ public class CropViewController: UIViewController {
                                         ratios: fixedRatioManager.ratios,
                                         fixRatiosShowType: config.cropToolbarConfig.fixRatiosShowType)
         ratioPresenter?.didGetRatio = {[weak self] ratio in
-            self?.setFixedRatio(ratio)
+            self?.setFixedRatio(ratio, zoom: false)
         }
         ratioPresenter?.present(by: self, in: presentSourceView)
     }