Fixing the Bug Where Repeatedly Adjusting Angles Causes GuideView Size to Decrease

Dev/Sources/SwiftUIDemo/DemoCropView2.swift

@@ -17,6 +17,7 @@ struct DemoCropView2: View {
 
   @StateObject var editingStack: EditingStack
   @State var resultImage: ResultImage?
+  @State var angle: EditingCrop.AdjustmentAngle = .zero
 
   init(
     editingStack: @escaping () -> EditingStack
@@ -52,11 +53,15 @@ struct DemoCropView2: View {
               .fill(kind == nil ? Color.white : Color.white.opacity(0.6))
           }
         )
+        .adjustmentAngle(angle)
         .frame(height: 500)
         .clipped()
+        .background(Color.gray)
 
         Spacer()
 
+        Slider(value: $angle.degrees, in: -45.0...45.0, step: 1)
+
       }
 
       VStack {

Sources/BrightroomEngine/Core/EditingCrop.swift

@@ -148,8 +148,6 @@ public struct EditingCrop: Equatable {
 
     imageSize.width *= scale
     imageSize.height *= scale
-    imageSize.width.round(.down)
-    imageSize.height.round(.down)
 
     modified.cropExtent = Self.fittingRect(
       rect: cropExtent,
@@ -169,7 +167,7 @@ public struct EditingCrop: Equatable {
    */
   public mutating func updateCropExtent(toFitAspectRatio newAspectRatio: PixelAspectRatio) {
 
-    let maxSize = newAspectRatio.sizeThatFitsWithRounding(in: imageSize)
+    let maxSize = newAspectRatio.sizeThatFits(in: imageSize)
 
     let proposed = CGRect(
       origin: .init(
@@ -260,31 +258,10 @@ public struct EditingCrop: Equatable {
 
     var fixed = rect
 
-    func containsFractionInCGFloat(_ value: CGFloat) -> Bool {
-      Int(exactly: value) == nil
-    }
-
-    func rectIsPixelPerfect(_ rect: CGRect) -> Bool {
-      guard containsFractionInCGFloat(rect.origin.x) == false else { return false }
-      guard containsFractionInCGFloat(rect.origin.y) == false else { return false }
-      guard containsFractionInCGFloat(rect.size.width) == false else { return false }
-      guard containsFractionInCGFloat(rect.size.height) == false else { return false }
-      return true
-    }
-
     func clamp<T: Comparable>(value: T, lower: T, upper: T) -> T {
       return min(max(value, lower), upper)
     }
 
-    /*
-     Drops decimal fraction
-     */
-
-    fixed.origin.x.round(.down)
-    fixed.origin.y.round(.down)
-    fixed.size.width.round(.down)
-    fixed.size.height.round(.down)
-
     /*
      Cuts the area off that out of maximum bounds
 
@@ -329,7 +306,7 @@ public struct EditingCrop: Equatable {
           )
         )
 
-        let newRect = aspectRatio.rectThatFitsWithRounding(in: maxRect)
+        let newRect = aspectRatio.rectThatFits(in: maxRect)
 
         fixed = newRect
 
@@ -347,7 +324,6 @@ public struct EditingCrop: Equatable {
       assert(fixed.width <= imageSize.width)
       assert(fixed.height <= imageSize.height)
 
-      assert(rectIsPixelPerfect(fixed))
     }
 
     #if DEBUG

Sources/BrightroomEngine/Library/Geometry.swift

@@ -179,7 +179,7 @@ public struct PixelAspectRatio: Hashable, CustomReflectable, Identifiable {
     .init(width: height, height: width)
   }
 
-  public func sizeThatFillRounding(in boundingSize: CGSize) -> CGSize {
+  public func sizeThatFill(in boundingSize: CGSize) -> CGSize {
     let widthRatio = boundingSize.width / width
     let heightRatio = boundingSize.height / height
     var size = boundingSize
@@ -191,12 +191,12 @@ public struct PixelAspectRatio: Hashable, CustomReflectable, Identifiable {
     }
 
     return CGSize(
-      width: size.width.rounded(.down),
-      height: size.height.rounded(.down)
+      width: size.width,
+      height: size.height
     )
   }
 
-  public func sizeThatFitsWithRounding(in boundingSize: CGSize) -> CGSize {
+  public func sizeThatFits(in boundingSize: CGSize) -> CGSize {
 
     let widthRatio = boundingSize.width / width
     let heightRatio = boundingSize.height / height
@@ -209,32 +209,27 @@ public struct PixelAspectRatio: Hashable, CustomReflectable, Identifiable {
     }
 
     return CGSize(
-      width: size.width.rounded(.down),
-      height: size.height.rounded(.down)
+      width: size.width,
+      height: size.height
     )
 
   }
 
-  public func rectThatFitsWithRounding(in boundingRect: CGRect) -> CGRect {
-    let size = sizeThatFitsWithRounding(in: boundingRect.size)
+  public func rectThatFits(in boundingRect: CGRect) -> CGRect {
+    let size = sizeThatFits(in: boundingRect.size)
     var origin = boundingRect.origin
     origin.x += (boundingRect.size.width - size.width) / 2.0
     origin.y += (boundingRect.size.height - size.height) / 2.0
 
-    origin.x.round(.down)
-    origin.y.round(.down)
-
     return CGRect(origin: origin, size: size)
   }
 
-  public func rectThatFillWithRounding(in boundingRect: CGRect) -> CGRect {
-    let size = sizeThatFillRounding(in: boundingRect.size)
+  public func rectThatFill(in boundingRect: CGRect) -> CGRect {
+    let size = sizeThatFill(in: boundingRect.size)
     var origin = CGPoint.zero
     origin.x = (boundingRect.size.width - size.width) / 2.0
     origin.y = (boundingRect.size.height - size.height) / 2.0
 
-    origin.x.round(.down)
-    origin.y.round(.down)
     return CGRect(origin: origin, size: size)
   }
 

Sources/BrightroomUI/Shared/Components/Crop/CropView.CropInsideOverlay.swift

@@ -216,8 +216,8 @@ extension CropView {
 
       super.layoutSubviews()
 
-      let width = (bounds.width / 3).rounded(.down)
-      let height = (bounds.height / 3).rounded(.down)
+      let width = (bounds.width / 3)
+      let height = (bounds.height / 3)
 
       do {
 

Sources/BrightroomUI/Shared/Components/Crop/CropView.swift

@@ -699,7 +699,7 @@ extension CropView {
           let bounds = self.bounds.inset(by: contentInset)
 
           let size = PixelAspectRatio(crop.cropExtent.size)
-            .sizeThatFitsWithRounding(in: bounds.size)
+            .sizeThatFits(in: bounds.size)
 
           return .init(
             origin: .init(
@@ -746,7 +746,7 @@ extension CropView {
           let bounds = self.bounds.inset(by: contentInset)
 
           let size = PixelAspectRatio(crop.cropExtent.size)
-            .sizeThatFitsWithRounding(in: bounds.size)
+            .sizeThatFits(in: bounds.size)
 
           return .init(
             origin: .init(

Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift

@@ -42,7 +42,7 @@ public final class BlurryMaskingView: PixelEditorCodeBasedView, UIScrollViewDele
       }
 
       let aspectRatio = PixelAspectRatio(proposedCrop.cropExtent.size)
-      let size = aspectRatio.sizeThatFitsWithRounding(in: bounds.size)
+      let size = aspectRatio.sizeThatFits(in: bounds.size)
 
       let (min, _) = proposedCrop.calculateZoomScale(visibleSize: size)