fix: allow set different fixed ratio after preset transforamtion (#106)

guoyingtao · Apr 26, 2021 · 06e98b8 · 06e98b8
1 parent c5a7891
commit 06e98b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Sources/Mantis/CropView/CropView.swift b/Sources/Mantis/CropView/CropView.swift
@@ -701,8 +701,9 @@ extension CropView {
     }
 
 
-    func setFixedRatioCropBox(zoom: Bool = true) {
-        viewModel.setCropBoxFrame(by: getInitialCropBoxRect(), and: getImageRatioH())
+    func setFixedRatioCropBox(zoom: Bool = true, cropBox: CGRect? = nil) {
+        let refCropBox = cropBox ?? getInitialCropBoxRect()
+        viewModel.setCropBoxFrame(by: refCropBox, and: getImageRatioH())
 
         let contentRect = getContentBounds()
         adjustUIForNewCrop(contentRect: contentRect, animation: false, zoom: zoom) { [weak self] in

diff --git a/Sources/Mantis/CropViewController/CropViewController.swift b/Sources/Mantis/CropViewController/CropViewController.swift
@@ -277,9 +277,16 @@ public class CropViewController: UIViewController {
         super.viewDidAppear(animated)
         processPresetTransformation() { [weak self] transform in
             guard let self = self else { return }
-            if case .alwaysUsingOnePresetFixedRatio = self.config.presetFixedRatioType {
+            if case .alwaysUsingOnePresetFixedRatio(let ratio) = self.config.presetFixedRatioType {
                 self.cropView.aspectRatioLockEnabled = true
-                self.cropView.viewModel.aspectRatio = transform.maskFrame.width / transform.maskFrame.height
+                self.cropToolbar.handleFixedRatioSetted(ratio: ratio)
+
+                if ratio == 0 {
+                    self.cropView.viewModel.aspectRatio = transform.maskFrame.width / transform.maskFrame.height
+                } else {
+                    self.cropView.viewModel.aspectRatio = CGFloat(ratio)
+                    self.cropView.setFixedRatioCropBox(zoom: false, cropBox: cropView.viewModel.cropBoxFrame)
+                }
             }
         }
     }