Code formatting, comments, and rounded rectangle

Author: bbrk24

Sources/SwiftCrossUI/Path.swift

@@ -171,6 +171,9 @@ public struct AffineTransform: Equatable, CustomDebugStringConvertible {
 }
 
 public struct Path {
+    /// A rectangle in 2-D space.
+    ///
+    /// This type is inspired by `CGRect`.
     public struct Rect: Equatable {
         public var origin: SIMD2<Double>
         public var size: SIMD2<Double>
@@ -186,6 +189,8 @@ public struct Path {
         public var height: Double { size.y }
 
         public var center: SIMD2<Double> { size * 0.5 + origin }
+        public var maxX: Double { size.x + origin.x }
+        public var maxY: Double { size.y + origin.y }
 
         public init(x: Double, y: Double, width: Double, height: Double) {
             origin = SIMD2(x: x, y: y)
@@ -209,7 +214,6 @@ public struct Path {
             clockwise: Bool
         )
         case transform(AffineTransform)
-        case subpath([Action], FillRule)
     }
 
     /// A list of every action that has been performed on this path.
@@ -286,10 +290,14 @@ public struct Path {
     }
 
     public consuming func addSubpath(_ subpath: Path) -> Path {
-        actions.append(.subpath(subpath.actions, subpath.fillRule))
+        actions.append(contentsOf: subpath.actions)
         return self
     }
 
+    /// Set the default stroke style for the path.
+    ///
+    /// This is not necessarily respected; it can be overridden by ``Shape/stroke(_:style:)``,
+    /// and is lost when the path is passed to ``addSubpath(_:)``.
     public consuming func stroke(style: StrokeStyle) -> Path {
         strokeStyle = style
         return self
@@ -300,3 +308,18 @@ public struct Path {
         return self
     }
 }
+
+extension Path {
+    @inlinable
+    public consuming func `if`(
+        _ condition: Bool,
+        then ifTrue: (consuming Path) -> Path,
+        else ifFalse: (consuming Path) -> Path = { $0 }
+    ) -> Path {
+        if condition {
+            ifTrue(self)
+        } else {
+            ifFalse(self)
+        }
+    }
+}

Sources/SwiftCrossUI/Views/Shapes/Capsule.swift

@@ -1,51 +1,9 @@
+/// A rounded rectangle whose corner radius is equal to half the length of its shortest side.
 public struct Capsule: Shape {
     public init() {}
 
     public func path(in bounds: Path.Rect) -> Path {
-        if bounds.width > bounds.height {
-            let radius = bounds.height / 2.0
-
-            return Path()
-                .move(to: SIMD2(x: bounds.width + bounds.x - radius, y: bounds.y))
-                .addArc(
-                    center: SIMD2(x: bounds.width + bounds.x - radius, y: bounds.center.y),
-                    radius: radius,
-                    startAngle: .pi * 1.5,
-                    endAngle: .pi * 0.5,
-                    clockwise: true
-                )
-                .addLine(to: SIMD2(x: radius + bounds.x, y: bounds.height + bounds.y))
-                .addArc(
-                    center: SIMD2(x: radius + bounds.x, y: bounds.center.y),
-                    radius: radius,
-                    startAngle: .pi * 0.5,
-                    endAngle: .pi * 1.5,
-                    clockwise: true
-                )
-                .addLine(to: SIMD2(x: bounds.width + bounds.x - radius, y: bounds.y))
-        } else if bounds.width < bounds.height {
-            let radius = bounds.width / 2.0
-
-            return Path()
-                .move(to: SIMD2(x: bounds.x, y: bounds.height + bounds.y - radius))
-                .addArc(
-                    center: SIMD2(x: bounds.center.x, y: bounds.height + bounds.y - radius),
-                    radius: radius,
-                    startAngle: .pi,
-                    endAngle: 0.0,
-                    clockwise: false
-                )
-                .addLine(to: SIMD2(x: bounds.width + bounds.x, y: radius + bounds.y))
-                .addArc(
-                    center: SIMD2(x: bounds.center.x, y: radius + bounds.y),
-                    radius: radius,
-                    startAngle: 0.0,
-                    endAngle: .pi,
-                    clockwise: false
-                )
-                .addLine(to: SIMD2(x: bounds.x, y: bounds.height + bounds.y - radius))
-        } else {
-            return Circle().path(in: bounds)
-        }
+        let radius = min(bounds.width, bounds.height) / 2.0
+        return RoundedRectangle(cornerRadius: radius).path(in: bounds)
     }
 }