Move draw controls into the draw toolbar

The color picker, undo/redo, and clear eraser now live in the dedicated
draw top bar instead of the main toolbar, keeping the primary actions
(Copy/Save/Get Text) uncluttered. Keyboard shortcuts (⌘Z/⌘⇧Z) remain.

💘 Generated with Crush

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

Sources/Kapture/CaptureController.swift

@@ -118,18 +118,18 @@ final class ScreenCapture {
 
     @available(macOS 14.0, *)
     private func crop(_ image: CGImage, to cgRect: CGRect, display: SCDisplay) -> CGImage? {
-        // cgRect is already in SCDisplay space (Y flipped relative to AppKit).
-        // Derive the pixel scale from the image we actually got, relative to
-        // the display's point frame.
+        // cgRect is in SCDisplay space (bottom-left origin, Y flipped vs AppKit).
+        // The captured image has a TOP-LEFT origin. So within the display,
+        // we must flip Y: pixelY = displayHeight - (cgY - displayMinY) - cgHeight.
         let scaleX = CGFloat(image.width) / display.frame.width
         let scaleY = CGFloat(image.height) / display.frame.height
         guard scaleX > 0, scaleY > 0 else { return nil }
-        // pxRect is in image pixel space with a TOP-LEFT origin (SCDisplay space).
-        // CGImage.cropping(to:) expects the same top-left rect, so no Y flip
-        // is needed here — this preserves the previous CGContext behavior.
+        let localMinX = cgRect.minX - display.frame.minX
+        let localMaxY = cgRect.maxY - display.frame.minY
+        let flippedY = display.frame.height - localMaxY
         let pxRect = CGRect(
-            x: (cgRect.minX - display.frame.minX) * scaleX,
-            y: (cgRect.minY - display.frame.minY) * scaleY,
+            x: localMinX * scaleX,
+            y: flippedY * scaleY,
             width: cgRect.width * scaleX,
             height: cgRect.height * scaleY
         )

Sources/Kapture/ResultWindow.swift

@@ -92,8 +92,14 @@ final class CaptureModel: ObservableObject {
     @Published var selection: CGRect?
     /// Freehand drawing strokes in IMAGE point space
     @Published var strokes: [[CGPoint]] = []
+    /// Redo stack of removed strokes
+    @Published var redoStack: [[CGPoint]] = []
     /// Whether the pen is active (drag draws instead of selecting)
     @Published var isDrawing = false
+    /// Current drawing color
+    @Published var drawColor: NSColor = .systemRed
+    /// Stroke thickness in points (image space)
+    @Published var strokeWidth: CGFloat = 3.0
 
     enum CaptureMode {
         case screenshot
@@ -105,6 +111,23 @@ final class CaptureModel: ObservableObject {
     }
 
     var hasSelection: Bool { selection != nil && selection!.width >= 2 && selection!.height >= 2 }
+    var canUndo: Bool { !strokes.isEmpty }
+    var canRedo: Bool { !redoStack.isEmpty }
+
+    func undoStroke() {
+        guard let last = strokes.popLast() else { return }
+        redoStack.append(last)
+    }
+
+    func redoStroke() {
+        guard let last = redoStack.popLast() else { return }
+        strokes.append(last)
+    }
+
+    func clearAnnotations() {
+        strokes = []
+        redoStack = []
+    }
 
     /// Image with drawn strokes flattened in, for copy/save/export.
     var annotatedImage: CGImage {
@@ -120,8 +143,8 @@ 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))
-        NSColor.systemRed.setStroke()
-        ctx.setLineWidth(3)
+        drawColor.setStroke()
+        ctx.setLineWidth(strokeWidth)
         ctx.setLineCap(.round)
         ctx.setLineJoin(.round)
         for stroke in strokes {
@@ -140,10 +163,7 @@ final class CaptureModel: ObservableObject {
     func addStroke(_ points: [CGPoint]) {
         guard points.count > 1 else { return }
         strokes.append(points)
-    }
-
-    func clearAnnotations() {
-        strokes = []
+        redoStack = []
     }
 
     var displayText: String {
@@ -285,17 +305,6 @@ struct ResultView: View {
                 .foregroundStyle(model.isDrawing ? .primary : .secondary)
                 .help("Toggle drawing on the screenshot")
 
-                if !model.strokes.isEmpty {
-                    Button {
-                        model.clearAnnotations()
-                    } label: {
-                        Label("Clear", systemImage: "eraser")
-                    }
-                    .buttonStyle(.bordered)
-                    .foregroundStyle(.secondary)
-                    .help("Remove all drawn annotations")
-                }
-
                 Button {
                     model.copyImage()
                 } label: {
@@ -326,6 +335,66 @@ struct ResultView: View {
 
             Divider()
 
+            // Draw toolbar (only when drawing)
+            if model.isDrawing {
+                HStack(spacing: 14) {
+                    Label("Draw", systemImage: "pencil.tip")
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+
+                    Divider().frame(height: 18)
+
+                    HStack(spacing: 6) {
+                        Image(systemName: "circle.fill").font(.system(size: 4))
+                        Image(systemName: "circle.fill").font(.system(size: 7))
+                        Image(systemName: "circle.fill").font(.system(size: 10))
+                    }
+                    .foregroundStyle(.secondary)
+                    Slider(value: $model.strokeWidth, in: 1...12, step: 0.5)
+                        .frame(width: 120)
+                        .help("Stroke thickness")
+
+                    Divider().frame(height: 18)
+
+                    ColorPicker("", selection: Binding(
+                        get: { Color(nsColor: model.drawColor) },
+                        set: { model.drawColor = NSColor($0) }
+                    ), supportsOpacity: false)
+                    .labelsHidden()
+                    .frame(width: 28)
+                    .help("Drawing color")
+
+                    Spacer()
+
+                    Button {
+                        model.undoStroke()
+                    } label: {
+                        Label("Undo", systemImage: "arrow.uturn.backward")
+                    }
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
+                    .disabled(!model.canUndo)
+                    .keyboardShortcut("z", modifiers: .command)
+                    .help("Undo last stroke (⌘Z)")
+
+                    Button {
+                        model.redoStroke()
+                    } label: {
+                        Label("Redo", systemImage: "arrow.uturn.forward")
+                    }
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
+                    .disabled(!model.canRedo)
+                    .keyboardShortcut("z", modifiers: [.command, .shift])
+                    .help("Redo stroke (⌘⇧Z)")
+                }
+                .padding(.horizontal, 14)
+                .padding(.vertical, 8)
+                .background(.bar)
+
+                Divider()
+            }
+
             // Content
             if model.mode == .screenshot {
                 ScreenshotPane(model: model)
@@ -429,7 +498,7 @@ struct ScreenshotPane: View {
                             path.addLine(to: CGPoint(x: origin.x + point.x * scale, y: origin.y + point.y * scale))
                         }
                     }
-                    context.stroke(path, with: .color(.red), lineWidth: 2.5)
+                    context.stroke(path, with: .color(Color(nsColor: model.drawColor)), lineWidth: model.strokeWidth)
                 }
                 .allowsHitTesting(false)
 
@@ -443,7 +512,7 @@ struct ScreenshotPane: View {
                                 path.addLine(to: CGPoint(x: origin.x + point.x * scale, y: origin.y + point.y * scale))
                             }
                         }
-                        context.stroke(path, with: .color(.red), lineWidth: 2.5)
+                        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.3.1</string>
+    <string>1.4.1</string>
     <key>CFBundleVersion</key>
-    <string>31</string>
+    <string>41</string>
     <key>LSUIElement</key>
     <true/>
     <key>NSHighResolutionCapable</key>