Fix flipped drawing when copying/saving annotated images

The strokes were stored in top-left image coordinates but drawn into an
AppKit CGContext with a bottom-left origin, so exports came out mirrored
and offset. Flip Y in the context before stroking so annotations land
where they were drawn.

💘 Generated with Crush

Assisted-by: Crush:deepseek-v4-flash-0731

Sources/Kapture/ResultWindow.swift

@@ -91,9 +91,9 @@ final class CaptureModel: ObservableObject {
     /// Drag selection rect in IMAGE point space (nil = none)
     @Published var selection: CGRect?
     /// Freehand drawing strokes in IMAGE point space
-    @Published var strokes: [[CGPoint]] = []
+    @Published var strokes: [Stroke] = []
     /// Redo stack of removed strokes
-    @Published var redoStack: [[CGPoint]] = []
+    @Published var redoStack: [Stroke] = []
     /// Whether the pen is active (drag draws instead of selecting)
     @Published var isDrawing = false
     /// Current drawing color
@@ -101,6 +101,12 @@ final class CaptureModel: ObservableObject {
     /// Stroke thickness in points (image space)
     @Published var strokeWidth: CGFloat = 3.0
 
+    struct Stroke {
+        let points: [CGPoint]
+        let width: CGFloat
+        let color: NSColor
+    }
+
     enum CaptureMode {
         case screenshot
         case text
@@ -143,26 +149,33 @@ final class CaptureModel: ObservableObject {
         let ctx = NSGraphicsContext.current!.cgContext
         // CGImage draws with a flipped Y in NSGraphicsContext
         ctx.draw(image, in: NSRect(origin: .zero, size: size))
-        drawColor.setStroke()
+        // Strokes are stored in TOP-LEFT image coordinates (from the SwiftUI
-        ctx.setLineWidth(strokeWidth)
+        // canvas), but the CGContext uses a BOTTOM-LEFT origin. Flip Y so the
+        // strokes land where they were drawn.
+        ctx.saveGState()
+        ctx.translateBy(x: 0, y: size.height)
+        ctx.scaleBy(x: 1, y: -1)
         ctx.setLineCap(.round)
         ctx.setLineJoin(.round)
         for stroke in strokes {
-            guard stroke.count > 1 else { continue }
+            guard stroke.points.count > 1 else { continue }
+            stroke.color.setStroke()
+            ctx.setLineWidth(stroke.width)
             ctx.beginPath()
-            ctx.move(to: stroke[0])
+            ctx.move(to: stroke.points[0])
-            for point in stroke.dropFirst() {
+            for point in stroke.points.dropFirst() {
                 ctx.addLine(to: point)
             }
             ctx.strokePath()
         }
+        ctx.restoreGState()
         NSGraphicsContext.restoreGraphicsState()
         return rep.cgImage ?? image
     }
 
     func addStroke(_ points: [CGPoint]) {
         guard points.count > 1 else { return }
-        strokes.append(points)
+        strokes.append(Stroke(points: points, width: strokeWidth, color: drawColor))
         redoStack = []
     }
 
@@ -305,49 +318,6 @@ struct ResultView: View {
                 .foregroundStyle(model.isDrawing ? .primary : .secondary)
                 .help("Toggle drawing on the screenshot")
 
-                if model.isDrawing {
-                    ColorPicker("", selection: Binding(
-                        get: { Color(nsColor: model.drawColor) },
-                        set: { model.drawColor = NSColor($0) }
-                    ), supportsOpacity: false)
-                    .labelsHidden()
-                    .frame(width: 28)
-                    .help("Drawing color")
-                }
-
-                if model.isDrawing || !model.strokes.isEmpty {
-                    HStack(spacing: 6) {
-                        Button {
-                            model.undoStroke()
-                        } label: {
-                            Image(systemName: "arrow.uturn.backward")
-                        }
-                        .buttonStyle(.bordered)
-                        .disabled(!model.canUndo)
-                        .keyboardShortcut("z", modifiers: .command)
-                        .help("Undo last stroke (⌘Z)")
-
-                        Button {
-                            model.redoStroke()
-                        } label: {
-                            Image(systemName: "arrow.uturn.forward")
-                        }
-                        .buttonStyle(.bordered)
-                        .disabled(!model.canRedo)
-                        .keyboardShortcut("z", modifiers: [.command, .shift])
-                        .help("Redo stroke (⌘⇧Z)")
-
-                        Button {
-                            model.clearAnnotations()
-                        } label: {
-                            Image(systemName: "eraser")
-                        }
-                        .buttonStyle(.bordered)
-                        .disabled(model.strokes.isEmpty)
-                        .help("Remove all drawn annotations")
-                    }
-                }
-
                 Button {
                     model.copyImage()
                 } label: {
@@ -417,6 +387,7 @@ struct ResultView: View {
                     .buttonStyle(.bordered)
                     .controlSize(.small)
                     .disabled(!model.canUndo)
+                    .keyboardShortcut("z", modifiers: .command)
                     .help("Undo last stroke (⌘Z)")
 
                     Button {
@@ -427,7 +398,18 @@ struct ResultView: View {
                     .buttonStyle(.bordered)
                     .controlSize(.small)
                     .disabled(!model.canRedo)
+                    .keyboardShortcut("z", modifiers: [.command, .shift])
                     .help("Redo stroke (⌘⇧Z)")
+
+                    Button {
+                        model.clearAnnotations()
+                    } label: {
+                        Label("Clear", systemImage: "eraser")
+                    }
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
+                    .disabled(model.strokes.isEmpty)
+                    .help("Remove all drawn annotations")
                 }
                 .padding(.horizontal, 14)
                 .padding(.vertical, 8)
@@ -531,15 +513,15 @@ struct ScreenshotPane: View {
 
                 // Completed strokes
                 Canvas { context, _ in
-                    var path = Path()
                     for stroke in model.strokes {
-                        guard stroke.count > 1 else { continue }
+                        guard stroke.points.count > 1 else { continue }
-                        path.move(to: CGPoint(x: origin.x + stroke[0].x * scale, y: origin.y + stroke[0].y * scale))
+                        var path = Path()
-                        for point in stroke.dropFirst() {
+                        path.move(to: CGPoint(x: origin.x + stroke.points[0].x * scale, y: origin.y + stroke.points[0].y * scale))
+                        for point in stroke.points.dropFirst() {
                             path.addLine(to: CGPoint(x: origin.x + point.x * scale, y: origin.y + point.y * scale))
                         }
+                        context.stroke(path, with: .color(Color(nsColor: stroke.color)), lineWidth: stroke.width)
                     }
-                    context.stroke(path, with: .color(Color(nsColor: model.drawColor)), lineWidth: model.strokeWidth)
                 }
                 .allowsHitTesting(false)
 

build-app.sh

@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
     <key>CFBundleIconFile</key>
     <string>Icon</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.4.0</string>
+    <string>1.4.3</string>
     <key>CFBundleVersion</key>
-    <string>40</string>
+    <string>43</string>
     <key>LSUIElement</key>
     <true/>
     <key>NSHighResolutionCapable</key>