fix: fix resetting rotation dial caused UI issue (#287)

fix cropToolBar button display issue when using bigger dynamic fonts
guoyingtao · Mar 2, 2023 · f432e36 · f432e36
1 parent 47add3a
commit f432e36
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/Sources/Mantis/CropViewController/CropToolbar.swift b/Sources/Mantis/CropViewController/CropToolbar.swift
@@ -256,24 +256,31 @@ extension CropToolbar {
         button.titleLabel?.minimumScaleFactor = 0.5
         button.translatesAutoresizingMaskIntoConstraints = false
 
+        let compressionPriority: Float
+
+        if let title = title {
+            button.setTitle(title, for: .normal)
+            button.setTitleColor(buttonColor, for: .normal)
+            button.accessibilityIdentifier = "\(title)"
+
+            // Set content compression resistance priority
+            compressionPriority = AutoLayoutPriorityType.high.rawValue + 2
+        } else {
+            // Set content compression resistance priority
+            compressionPriority = AutoLayoutPriorityType.high.rawValue + 1
+        }
+
         // Set content hugging priority
         let huggingPriority: Float = 250
         button.setContentHuggingPriority(UILayoutPriority(rawValue: huggingPriority), for: .horizontal)
         button.setContentHuggingPriority(UILayoutPriority(rawValue: huggingPriority), for: .vertical)
 
-        // Set content compression resistance priority
-        let compressionPriority = AutoLayoutPriorityType.high.rawValue + 1
-        button.setContentCompressionResistancePriority(UILayoutPriority(rawValue: compressionPriority), for: .horizontal)
-        button.setContentCompressionResistancePriority(UILayoutPriority(rawValue: compressionPriority), for: .vertical)
-
         // Set width constraint
         button.widthAnchor.constraint(greaterThanOrEqualToConstant: button.intrinsicContentSize.width).isActive = true
+
+        button.setContentCompressionResistancePriority(UILayoutPriority(rawValue: compressionPriority), for: .horizontal)
+        button.setContentCompressionResistancePriority(UILayoutPriority(rawValue: compressionPriority), for: .vertical)
 
-        if let title = title {
-            button.setTitle(title, for: .normal)
-            button.setTitleColor(buttonColor, for: .normal)
-            button.accessibilityIdentifier = "\(title)"
-        }
 
         button.addTarget(self, action: action, for: .touchUpInside)
         button.contentEdgeInsets = UIEdgeInsets(top: 4, left: 10, bottom: 4, right: 10)

diff --git a/Sources/Mantis/RotationDial/RotationDialPlate.swift b/Sources/Mantis/RotationDial/RotationDialPlate.swift
@@ -165,5 +165,6 @@ class RotationDialPlate: UIView {
 
     func reset() {
         transform = .identity
+        layer.sublayers?.forEach({ $0.removeFromSuperlayer() })
     }
 }