fix: solve the issues when using normalizedTransform with presetFixed…

…RatioType (#98)
guoyingtao · Apr 22, 2021 · de03623 · de03623
1 parent 5e8eb20
commit de03623
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/Sources/Mantis/CropView/CropView.swift b/Sources/Mantis/CropView/CropView.swift
@@ -556,7 +556,7 @@ extension CropView {
             rotation: getTotalRadians(),
             scale: scrollView.zoomScale,
             manualZoomed: manualZoomed,
-            intialMaskFrame: viewModel.cropOrignFrame,
+            intialMaskFrame: getInitialCropBoxRect(),
             maskFrame: gridOverlayView.frame,
             scrollBounds: scrollView.bounds
         )
@@ -700,9 +700,9 @@ extension CropView {
         rotationDial?.rotateDialPlate(to: CGAngle(radians: radians), animated: false)
     }
 
+
     func setFixedRatioCropBox(zoom: Bool = true) {
-        viewModel.setCropBoxFrame(by: getInitialCropBoxRect(),
-                                  and: getImageRatioH())
+        viewModel.setCropBoxFrame(by: getInitialCropBoxRect(), and: getImageRatioH())
 
         let contentRect = getContentBounds()
         adjustUIForNewCrop(contentRect: contentRect, animation: false, zoom: zoom) { [weak self] in

diff --git a/Sources/Mantis/CropView/CropViewModel.swift b/Sources/Mantis/CropView/CropViewModel.swift
@@ -165,8 +165,8 @@ class CropViewModel: NSObject {
         return newCropBoxFrame
     }
 
-    func setCropBoxFrame(by initialCropBox: CGRect, and imageRationH: Double) {
-        var cropBoxFrame = initialCropBox
+    func setCropBoxFrame(by refCropBox: CGRect, and imageRationH: Double) {
+        var cropBoxFrame = refCropBox
         let center = cropBoxFrame.center
 
         if (aspectRatio > CGFloat(imageRationH)) {

diff --git a/Sources/Mantis/CropViewController/CropViewController.swift b/Sources/Mantis/CropViewController/CropViewController.swift
@@ -109,7 +109,11 @@ public class CropViewController: UIViewController {
         switch(config.presetFixedRatioType) {
             case .alwaysUsingOnePresetFixedRatio(let ratio):
                 config.cropToolbarConfig.includeFixedRatioSettingButton = false
-                setFixedRatio(ratio)
+
+                if case .none = config.presetTransformationType  {
+                    setFixedRatio(ratio)
+                }
+
             case .canUseMultiplePresetFixedRatio(let defaultRatio):
                 if (defaultRatio > 0) {
                     setFixedRatio(defaultRatio)
@@ -213,8 +217,7 @@ public class CropViewController: UIViewController {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
             self?.cropView.handleRotate()
         }
-    }
-
+    }    
 
     private func setFixedRatio(_ ratio: Double, zoom: Bool = true) {
         cropToolbar.handleFixedRatioSetted(ratio: ratio)
@@ -250,7 +253,7 @@ public class CropViewController: UIViewController {
         }
     }
 
-    private func processPresetTransformation(completion: ()->Void) {
+    private func processPresetTransformation(completion: (Transformation)->Void) {
         if case .presetInfo(let transformInfo) = config.presetTransformationType {
             var newTransform = getTransformInfo(byTransformInfo: transformInfo)
 
@@ -261,25 +264,22 @@ public class CropViewController: UIViewController {
             let adjustScale = (cropView.viewModel.cropBoxFrame.width / cropView.viewModel.cropOrignFrame.width) / (transformInfo.maskFrame.width / transformInfo.intialMaskFrame.width)
             newTransform.scale *= adjustScale
             cropView.transform(byTransformInfo: newTransform)
-            completion()
+            completion(transformInfo)
         } else if case .presetNormalizedInfo(let normailizedInfo) = config.presetTransformationType {
             let transformInfo = getTransformInfo(byNormalizedInfo: normailizedInfo);
             cropView.transform(byTransformInfo: transformInfo)
             cropView.scrollView.frame = transformInfo.maskFrame
-            completion()
+            completion(transformInfo)
         }
     }
 
     public override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-
-        processPresetTransformation { [weak self] in
+        processPresetTransformation() { [weak self] transform in
             guard let self = self else { return }
-
-            // Preset transformation changed preset fixed ratio crop box
-            // So we need to reset it again.
             if case .alwaysUsingOnePresetFixedRatio = self.config.presetFixedRatioType {
-                self.cropView.setFixedRatioCropBox()
+                self.cropView.aspectRatioLockEnabled = true
+                self.cropView.viewModel.aspectRatio = transform.maskFrame.width / transform.maskFrame.height
             }
         }
     }

diff --git a/Sources/Mantis/Mantis.swift b/Sources/Mantis/Mantis.swift
@@ -71,7 +71,7 @@ public enum PresetTransformationType {
 public enum PresetFixedRatioType {
     /** When choose alwaysUsingOnePresetFixedRatio, fixed-ratio setting button does not show.
      */
-    case alwaysUsingOnePresetFixedRatio(ratio: Double)
+    case alwaysUsingOnePresetFixedRatio(ratio: Double = 0)
     case canUseMultiplePresetFixedRatio(defaultRatio: Double = 0)
 }