Add Path and Shape

.github/workflows/swift-macos.yml

@@ -35,6 +35,7 @@ jobs:
         swift build --target StressTestExample && \
         swift build --target SpreadsheetExample && \
         swift build --target NotesExample && \
-        swift build --target GtkExample
+        swift build --target GtkExample && \
+        swift build --target PathsExample
     - name: Test
       run: swift test --test-product swift-cross-uiPackageTests

.github/workflows/swift-uikit.yml

@@ -46,6 +46,7 @@ jobs:
             buildtarget NavigationExample
             buildtarget StressTestExample
             buildtarget NotesExample
+            buildtarget PathsExample
 
             if [ $devicetype != TV ]; then
               # Slider is not implemented for tvOS

.gitignore

@@ -9,6 +9,6 @@ DerivedData/
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 /.vscode
 *.pyc
-/.swiftpm
+.swiftpm
 vcpkg_installed/
 *.trace

Examples/Bundler.toml

@@ -49,3 +49,8 @@ version = '0.1.0'
 identifier = 'dev.swiftcrossui.NotesExample'
 product = 'NotesExample'
 version = '0.1.0'
+
+[apps.PathsExample]
+identifier = 'dev.swiftcrossui.PathsExample'
+product = 'PathsExample'
+version = '0.1.0'

Examples/Package.swift

@@ -65,5 +65,9 @@ let package = Package(
             name: "NotesExample",
             dependencies: exampleDependencies
         ),
+        .executableTarget(
+            name: "PathsExample",
+            dependencies: exampleDependencies
+        )
     ]
 )

Examples/Sources/PathsExample/PathsApp.swift

@@ -0,0 +1,123 @@
+import DefaultBackend
+import Foundation  // for sin, cos
+import SwiftCrossUI
+
+struct ArcShape: StyledShape {
+    var startAngle: Double
+    var endAngle: Double
+    var clockwise: Bool
+
+    var strokeColor: Color? = Color.green
+    let fillColor: Color? = nil
+    let strokeStyle: StrokeStyle? = StrokeStyle(width: 5.0)
+
+    func path(in bounds: Path.Rect) -> Path {
+        Path()
+            .addArc(
+                center: bounds.center,
+                radius: min(bounds.width, bounds.height) / 2.0 - 2.5,
+                startAngle: startAngle,
+                endAngle: endAngle,
+                clockwise: clockwise
+            )
+    }
+
+    func size(fitting proposal: SIMD2<Int>) -> ViewSize {
+        let diameter = max(11, min(proposal.x, proposal.y))
+        return ViewSize(
+            size: SIMD2(x: diameter, y: diameter),
+            idealSize: SIMD2(x: 100, y: 100),
+            idealWidthForProposedHeight: proposal.y,
+            idealHeightForProposedWidth: proposal.x,
+            minimumWidth: 11,
+            minimumHeight: 11,
+            maximumWidth: nil,
+            maximumHeight: nil
+        )
+    }
+}
+
+@main
+struct PathsApp: App {
+    var body: some Scene {
+        WindowGroup("PathsApp") {
+            HStack {
+                ZStack {
+                    RoundedRectangle(cornerRadius: 12)
+                        .fill(.gray)
+
+                    HStack {
+                        VStack {
+                            Text("Clockwise")
+
+                            HStack {
+                                ArcShape(
+                                    startAngle: .pi * 2.0 / 3.0,
+                                    endAngle: .pi * 1.5,
+                                    clockwise: true
+                                )
+
+                                ArcShape(
+                                    startAngle: .pi * 1.5,
+                                    endAngle: .pi * 1.0 / 3.0,
+                                    clockwise: true
+                                )
+                            }
+
+                            HStack {
+                                ArcShape(
+                                    startAngle: .pi * 1.5,
+                                    endAngle: .pi * 2.0 / 3.0,
+                                    clockwise: true
+                                )
+
+                                ArcShape(
+                                    startAngle: .pi * 1.0 / 3.0,
+                                    endAngle: .pi * 1.5,
+                                    clockwise: true
+                                )
+                            }
+                        }
+
+                        VStack {
+                            Text("Counter-clockwise")
+
+                            HStack {
+                                ArcShape(
+                                    startAngle: .pi * 1.5,
+                                    endAngle: .pi * 2.0 / 3.0,
+                                    clockwise: false
+                                )
+
+                                ArcShape(
+                                    startAngle: .pi * 1.0 / 3.0,
+                                    endAngle: .pi * 1.5,
+                                    clockwise: false
+                                )
+                            }
+
+                            HStack {
+                                ArcShape(
+                                    startAngle: .pi * 2.0 / 3.0,
+                                    endAngle: .pi * 1.5,
+                                    clockwise: false
+                                )
+
+                                ArcShape(
+                                    startAngle: .pi * 1.5,
+                                    endAngle: .pi * 1.0 / 3.0,
+                                    clockwise: false
+                                )
+                            }
+                        }
+                    }.padding()
+                }
+                .padding()
+
+                Ellipse()
+                    .fill(.blue)
+                    .padding()
+            }
+        }
+    }
+}

Package.swift

@@ -107,7 +107,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/stackotter/swift-winui",
-            branch: "42fe0034b7162f2de71ceea95725915d1147455a"
+            branch: "a81bc36e3ac056fbc740e9df30ff0d80af5ecd21"
         ),
         // .package(
         //     url: "https://github.com/stackotter/TermKit",