Add window detection capture with rounded corners

Hovering during selection now highlights the window under the cursor;
clicking captures it with a rounded-corner alpha mask matching macOS
window chrome. Dragging still switches to manual marquee selection.

💘 Generated with Crush

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

Sources/Kapture/CaptureController.swift

@@ -59,13 +59,25 @@ final class CaptureController: NSObject {
             OverlayWindow(
                 screen: screen,
                 onComplete: { [weak self] rect in self?.finishSelection(rect) },
-                onCancel: { [weak self] in self?.cancelSelection() }
+                onCancel: { [weak self] in self?.cancelSelection() },
+                onWindowPick: { [weak self] rect in self?.finishWindowPick(rect) }
             )
         }
         overlays.forEach { $0.makeKeyAndOrderFront(nil) }
         overlayIDs = overlays.map { $0.windowNumber }
     }
 
+    /// A window was picked from hover — capture it with rounded corners.
+    private func finishWindowPick(_ rect: NSRect) {
+        let ids = overlayIDs
+        hideOverlays()
+        isSelecting = false
+        restorePreviousApp()
+        DispatchQueue.main.async { [self] in
+            capture(rect, excludingWindowIDs: ids, roundedCorners: true)
+        }
+    }
+
     private func finishSelection(_ rect: NSRect) {
         let ids = overlayIDs
         hideOverlays()
@@ -94,8 +106,8 @@ final class CaptureController: NSObject {
         previousApp = nil
     }
 
-    private func capture(_ rect: NSRect, excludingWindowIDs ids: [Int]) {
-        ScreenCapture.shared.capture(rect, excludingWindowIDs: ids) { [weak self] image in
+    private func capture(_ rect: NSRect, excludingWindowIDs ids: [Int], roundedCorners: Bool = false) {
+        ScreenCapture.shared.capture(rect, excludingWindowIDs: ids, roundedCorners: roundedCorners) { [weak self] image in
             DispatchQueue.main.async {
                 self?.isSelecting = false
                 self?.restorePreviousApp()
@@ -117,16 +129,19 @@ final class ScreenCapture {
     private init() {}
 
     @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.
+    private func crop(_ image: CGImage, to cgRect: CGRect, display: SCDisplay, roundedCorners: Bool = false) -> CGImage? {
+        // 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 }
+        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
         )
@@ -134,15 +149,36 @@ final class ScreenCapture {
         // display's frame (e.g. secondary monitor coordinate quirks).
         let safeRect = pxRect.intersection(CGRect(x: 0, y: 0, width: CGFloat(image.width), height: CGFloat(image.height)))
         guard safeRect.width >= 1, safeRect.height >= 1 else { return nil }
-        guard let cropCtx = CGContext(
-            data: nil, width: Int(safeRect.width), height: Int(safeRect.height),
-            bitsPerComponent: 8, bytesPerRow: 0,
-            space: CGColorSpaceCreateDeviceRGB(),
-            bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
-        ) else { return nil }
-        cropCtx.interpolationQuality = .high
-        cropCtx.draw(image, in: CGRect(x: -safeRect.minX, y: -safeRect.minY, width: CGFloat(image.width), height: CGFloat(image.height)))
-        return cropCtx.makeImage()
+        // Use a pixel-exact subimage crop instead of redrawing through a
+        // CGContext, which resamples and loses quality on retina captures.
+        let rounded = safeRect.integral
+        guard rounded.width >= 1, rounded.height >= 1 else { return nil }
+        guard var result = image.cropping(to: rounded) else { return nil }
+
+        // Apply a rounded-corner alpha mask for window captures, matching
+        // macOS window chrome (≈10pt radius, scaled to image pixels).
+        if roundedCorners {
+            let radius = 10 * scaleX
+            let maskRect = CGRect(x: 0, y: 0, width: result.width, height: result.height)
+            guard let maskCtx = CGContext(
+                data: nil, width: result.width, height: result.height,
+                bitsPerComponent: 8, bytesPerRow: 0,
+                space: CGColorSpaceCreateDeviceRGB(),
+                bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
+            ) else { return result }
+            maskCtx.setFillColor(CGColor(gray: 1, alpha: 1))
+            maskCtx.fill(maskRect)
+            maskCtx.setBlendMode(.clear)
+            maskCtx.setFillColor(CGColor(gray: 0, alpha: 1))
+            maskCtx.addPath(CGPath(roundedRect: maskRect, cornerWidth: radius, cornerHeight: radius, transform: nil))
+            maskCtx.fillPath()
+            maskCtx.setBlendMode(.normal)
+            if let mask = maskCtx.makeImage(),
+               let masked = result.masking(mask) {
+                result = masked
+            }
+        }
+        return result
     }
 
     @available(macOS 14.0, *)
@@ -155,7 +191,7 @@ final class ScreenCapture {
         return content.displays.first(where: { $0.displayID == cgID }) ?? content.displays.first
     }
 
-    func capture(_ rect: NSRect, excludingWindowIDs excludedIDs: [Int], completion: @escaping (CGImage?) -> Void) {
+    func capture(_ rect: NSRect, excludingWindowIDs excludedIDs: [Int], roundedCorners: Bool = false, completion: @escaping (CGImage?) -> Void) {
         if #available(macOS 14.0, *) {
             Task {
                 guard let content = try? await SCShareableContent.current,
@@ -180,12 +216,12 @@ final class ScreenCapture {
                 config.height = Int(CGFloat(display.height) * backingScale)
                 config.showsCursor = true
 
-                // ScreenCaptureKit's Y axis is flipped relative to AppKit
-                // NSScreen frames. Convert the selection into SCDisplay space
-                // using the matching NSScreen's top edge, then crop there.
+                // ScreenCaptureKit uses a different origin than AppKit for
+                // screens stacked around the main display: per-display,
+                // SCDisplay y = appKitY - NSScreen.maxY + SCDisplay.maxY.
                 let scRect = CGRect(
                     x: rect.minX,
-                    y: screen.frame.maxY - rect.maxY + display.frame.minY,
+                    y: rect.minY - screen.frame.maxY + display.frame.maxY,
                     width: rect.width,
                     height: rect.height
                 )
@@ -194,7 +230,7 @@ final class ScreenCapture {
                     completion(nil)
                     return
                 }
-                completion(self.crop(image, to: scRect, display: display))
+                completion(self.crop(image, to: scRect, display: display, roundedCorners: roundedCorners))
             }
         } else {
             guard let primary = NSScreen.screens.first(where: { $0.frame.origin == .zero }) ?? NSScreen.screens.first else {

Sources/Kapture/OverlayView.swift

@@ -1,8 +1,8 @@
 import AppKit
 
 final class OverlayWindow: NSPanel {
-    init(screen: NSScreen, onComplete: @escaping (NSRect) -> Void, onCancel: @escaping () -> Void) {
-        let content = OverlayView(onComplete: onComplete, onCancel: onCancel)
+    init(screen: NSScreen, onComplete: @escaping (NSRect) -> Void, onCancel: @escaping () -> Void, onWindowPick: @escaping (NSRect) -> Void) {
+        let content = OverlayView(onComplete: onComplete, onCancel: onCancel, onWindowPick: onWindowPick)
         super.init(
             contentRect: screen.frame,
             styleMask: [.borderless, .nonactivatingPanel],
@@ -25,13 +25,21 @@ final class OverlayWindow: NSPanel {
 final class OverlayView: NSView {
     private let onComplete: (NSRect) -> Void
     private let onCancel: () -> Void
+    private let onWindowPick: (NSRect) -> Void
 
     private var startPoint: NSPoint?
     private(set) var selection: NSRect?
+    private var isDragging = false
 
-    init(onComplete: @escaping (NSRect) -> Void, onCancel: @escaping () -> Void) {
+    // Window detection
+    private var trackedWindows: [(id: CGWindowID, frame: NSRect)] = []
+    private var hoveredWindowFrame: NSRect?
+    private var excludedIDs: [Int] = []
+
+    init(onComplete: @escaping (NSRect) -> Void, onCancel: @escaping () -> Void, onWindowPick: @escaping (NSRect) -> Void) {
         self.onComplete = onComplete
         self.onCancel = onCancel
+        self.onWindowPick = onWindowPick
         super.init(frame: .zero)
     }
 
@@ -47,6 +55,85 @@ final class OverlayView: NSView {
         addCursorRect(bounds, cursor: .crosshair)
     }
 
+    // MARK: - Window detection
+
+    /// Rebuild the list of capturable windows intersecting this screen.
+    /// Called lazily on mouse moves; cheap enough for interactive hover.
+    private func refreshTrackedWindows() {
+        guard let window = window else { return }
+        let screenFrame = window.convertToScreen(NSRect(origin: .zero, size: bounds.size))
+        // Exclude this overlay's own window (the other overlays don't intersect
+        // this screen, so the on-screen filter handles them).
+        let ownID = window.windowNumber
+
+        guard let list = CGWindowListCopyWindowInfo(
+            [ .optionOnScreenOnly, .excludeDesktopElements ], kCGNullWindowID
+        ) as? [[String: Any]] else { trackedWindows = []; return }
+
+        var found: [(CGWindowID, NSRect)] = []
+        for info in list {
+            guard let cid = info[kCGWindowNumber as String] as? CGWindowID,
+                  let bounds = info[kCGWindowBounds as String] as? [String: CGFloat],
+                  let layer = info[kCGWindowLayer as String] as? Int,
+                  layer == 0
+            else { continue }
+            // Skip our own overlays
+            if Int(cid) == ownID { continue }
+            let rect = NSRect(
+                x: bounds["X"] ?? 0,
+                y: bounds["Y"] ?? 0,
+                width: bounds["Width"] ?? 0,
+                height: bounds["Height"] ?? 0
+            )
+            guard rect.width >= 80, rect.height >= 60 else { continue }
+            // Skip tiny/utility windows
+            guard rect.width < screenFrame.width || rect.height < screenFrame.height else { continue }
+            // Only windows intersecting this screen
+            guard rect.intersects(screenFrame) else { continue }
+            found.append((cid, rect))
+        }
+        trackedWindows = found
+    }
+
+    private func windowFrame(at point: NSPoint) -> NSRect? {
+        guard let window = window else { return nil }
+        let screenPoint = window.convertToScreen(NSRect(origin: point, size: .zero))
+        // CGWindowList bounds use a TOP-LEFT origin; convert the cursor point.
+        guard let mainScreen = NSScreen.screens.first else { return nil }
+        let topLeftPoint = NSPoint(
+            x: screenPoint.origin.x,
+            y: mainScreen.frame.height - screenPoint.origin.y
+        )
+        // Pick the frontmost (list order) window containing the point
+        for (_, frame) in trackedWindows {
+            if frame.contains(topLeftPoint) {
+                return frame
+            }
+        }
+        return nil
+    }
+
+    /// Convert a CGWindowList (top-left origin) frame into AppKit screen
+    /// coordinates (bottom-left origin) for capture.
+    private static func cgToAppKit(rect: NSRect) -> NSRect {
+        guard let mainScreen = NSScreen.screens.first else { return rect }
+        let y = mainScreen.frame.height - rect.origin.y - rect.height
+        return NSRect(x: rect.origin.x, y: y, width: rect.width, height: rect.height)
+    }
+
+    // MARK: - Events
+
+    override func mouseMoved(with event: NSEvent) {
+        guard !isDragging else { return }
+        refreshTrackedWindows()
+        let p = convert(event.locationInWindow, from: nil)
+        let frame = windowFrame(at: p)
+        if frame != hoveredWindowFrame {
+            hoveredWindowFrame = frame
+            needsDisplay = true
+        }
+    }
+
     override func mouseDown(with event: NSEvent) {
         let p = convert(event.locationInWindow, from: nil)
         startPoint = p
@@ -56,6 +143,8 @@ final class OverlayView: NSView {
 
     override func mouseDragged(with event: NSEvent) {
         guard let start = startPoint else { return }
+        isDragging = true
+        hoveredWindowFrame = nil
         let p = convert(event.locationInWindow, from: nil)
         selection = NSRect(
             x: min(start.x, p.x),
@@ -67,9 +156,20 @@ final class OverlayView: NSView {
     }
 
     override func mouseUp(with event: NSEvent) {
-        guard let sel = selection else { return }
-        if sel.width >= 2, sel.height >= 2 {
-            onComplete(window!.convertToScreen(sel))
+        if isDragging {
+            guard let sel = selection else { return }
+            if sel.width >= 2, sel.height >= 2 {
+                onComplete(window!.convertToScreen(sel))
+            } else {
+                onCancel()
+            }
+            return
+        }
+
+        // No drag: it was a click. If a window is hovered, capture it with
+        // rounded corners; otherwise treat as an empty marquee (cancel).
+        if let frame = hoveredWindowFrame {
+            onWindowPick(Self.cgToAppKit(rect: frame))
         } else {
             onCancel()
         }
@@ -87,6 +187,30 @@ final class OverlayView: NSView {
         NSColor.black.withAlphaComponent(0.35).setFill()
         NSBezierPath(rect: bounds).fill()
 
+        // Highlight the hovered window (rounded, like the real window corners)
+        if let frame = hoveredWindowFrame {
+            // Convert CGWindowList (top-left) frame to view (bottom-left) space
+            guard let window = window, let mainScreen = NSScreen.screens.first else { return }
+            let screenFrame = window.convertToScreen(NSRect(origin: .zero, size: bounds.size))
+            let viewFrame = NSRect(
+                x: frame.origin.x - screenFrame.origin.x,
+                y: mainScreen.frame.height - frame.origin.y - frame.height - screenFrame.origin.y,
+                width: frame.width,
+                height: frame.height
+            )
+            NSGraphicsContext.current?.saveGraphicsState()
+            NSGraphicsContext.current?.compositingOperation = .clear
+            NSColor.black.setFill()
+            NSBezierPath(roundedRect: viewFrame, xRadius: 10, yRadius: 10).fill()
+            NSGraphicsContext.current?.restoreGraphicsState()
+
+            let border = NSBezierPath(roundedRect: viewFrame, xRadius: 10, yRadius: 10)
+            border.lineWidth = 2
+            NSColor.controlAccentColor.setStroke()
+            border.stroke()
+            return
+        }
+
         guard let sel = selection, sel.width > 0, sel.height > 0 else { return }
 
         NSGraphicsContext.current?.saveGraphicsState()

Sources/Kapture/ResultWindow.swift

@@ -88,6 +88,24 @@ final class CaptureModel: ObservableObject {
     @Published var extractedText: String?
     @Published var isOCRRunning = false
     @Published var statusMessage: String?
+    /// Drag selection rect in IMAGE point space (nil = none)
+    @Published var selection: CGRect?
+    /// Freehand drawing strokes in IMAGE point space
+    @Published var strokes: [Stroke] = []
+    /// Redo stack of removed strokes
+    @Published var redoStack: [Stroke] = []
+    /// 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
+
+    struct Stroke {
+        let points: [CGPoint]
+        let width: CGFloat
+        let color: NSColor
+    }
 
     enum CaptureMode {
         case screenshot
@@ -98,24 +116,104 @@ final class CaptureModel: ObservableObject {
         self.image = image
     }
 
+    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 {
+        guard !strokes.isEmpty else { return image }
+        let size = NSSize(width: image.width, height: image.height)
+        guard let rep = NSBitmapImageRep(
+            bitmapDataPlanes: nil, pixelsWide: Int(size.width), pixelsHigh: Int(size.height),
+            bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false,
+            colorSpaceName: .deviceRGB, bytesPerRow: 0, bitsPerPixel: 0
+        ) else { return image }
+        NSGraphicsContext.saveGraphicsState()
+        NSGraphicsContext.current = NSGraphicsContext(bitmapImageRep: rep)
+        let ctx = NSGraphicsContext.current!.cgContext
+        // CGImage draws with a flipped Y in NSGraphicsContext
+        ctx.draw(image, in: NSRect(origin: .zero, size: size))
+        // Strokes are stored in TOP-LEFT image coordinates (from the SwiftUI
+        // 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.points.count > 1 else { continue }
+            stroke.color.setStroke()
+            ctx.setLineWidth(stroke.width)
+            ctx.beginPath()
+            ctx.move(to: stroke.points[0])
+            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(Stroke(points: points, width: strokeWidth, color: drawColor))
+        redoStack = []
+    }
+
     var displayText: String {
         if isOCRRunning {
             return "Recognizing text…"
         }
-        return extractedText ?? "Text appears here — click “Get Text”."
+        return extractedText ?? "Select text in the screenshot, then click “Get Text”."
     }
 
-    func runOCR() {
+    func cropImage(to rectInImage: CGRect) -> CGImage? {
+        return image.cropping(to: rectInImage)
+    }
+
+    func runOCR(over selectionOnly: CGRect? = nil) {
         guard !isOCRRunning else { return }
         isOCRRunning = true
         statusMessage = nil
-        OCRService.shared.recognize(image) { [weak self] text in
+
+        let targetImage: CGImage
+        if let sel = selectionOnly {
+            guard let cropped = image.cropping(to: sel) else {
+                self.isOCRRunning = false
+                self.statusMessage = "Selection too small."
+                return
+            }
+            targetImage = cropped
+        } else {
+            targetImage = image
+        }
+
+        OCRService.shared.recognize(targetImage) { [weak self] text in
             Task { @MainActor in
                 guard let self else { return }
                 self.isOCRRunning = false
                 self.mode = .text
                 if text.isEmpty {
-                    self.extractedText = "No text found in the screenshot."
+                    self.extractedText = "No text found in the selection."
                 } else {
                     self.extractedText = text
                     let pasteboard = NSPasteboard.general
@@ -127,6 +225,11 @@ final class CaptureModel: ObservableObject {
         }
     }
 
+    func runOCRSelection() {
+        guard let sel = selection, hasSelection else { return }
+        runOCR(over: sel)
+    }
+
     func copyText() {
         guard let text = extractedText else { return }
         let pasteboard = NSPasteboard.general
@@ -138,7 +241,7 @@ final class CaptureModel: ObservableObject {
     func copyImage() {
         let pasteboard = NSPasteboard.general
         pasteboard.clearContents()
-        pasteboard.writeObjects([NSImage(cgImage: image, size: .zero)])
+        pasteboard.writeObjects([NSImage(cgImage: annotatedImage, size: .zero)])
         statusMessage = "Image copied to clipboard."
     }
 
@@ -151,7 +254,7 @@ final class CaptureModel: ObservableObject {
             statusMessage = "Could not create PNG file."
             return
         }
-        CGImageDestinationAddImage(dest, image, nil)
+        CGImageDestinationAddImage(dest, annotatedImage, nil)
         if CGImageDestinationFinalize(dest) {
             statusMessage = "Saved PNG."
         } else {
@@ -171,73 +274,322 @@ struct ResultView: View {
     let onClose: () -> Void
 
     var body: some View {
-        VStack(spacing: 10) {
-            HStack {
+        VStack(spacing: 0) {
+            // Toolbar
+            HStack(spacing: 10) {
                 Picker("", selection: $model.mode) {
                     Text("Screenshot").tag(CaptureModel.CaptureMode.screenshot)
                     Text("Text").tag(CaptureModel.CaptureMode.text)
-                    if model.isOCRRunning {
-                        Text("…").tag(CaptureModel.CaptureMode.text)
-                    }
                 }
                 .pickerStyle(.segmented)
                 .fixedSize()
-                Spacer()
-                Button("Copy Image") { model.copyImage() }
-                Button("Save PNG…") { model.savePNG() }
-                Button("Get Text") { model.runOCR() }
-                    .disabled(model.isOCRRunning || model.extractedText != nil)
-                Button("Close") { onClose() }
-            }
-            .padding(.horizontal, 12)
-            .padding(.top, 10)
 
-            if model.mode == .screenshot {
-                GeometryReader { geo in
-                    let imageWidth = CGFloat(model.image.width)
-                    Image(nsImage: NSImage(cgImage: model.image, size: .zero))
-                        .resizable()
-                        // Downscale with smoothing (AA); upscale keeps pixels crisp.
-                        .interpolation(imageWidth >= geo.size.width ? .high : .none)
-                        .aspectRatio(contentMode: .fit)
+                Spacer()
+
+                if model.hasSelection {
+                    Button {
+                        model.runOCRSelection()
+                    } label: {
+                        Label("OCR Selection", systemImage: "text.magnifyingglass")
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .disabled(model.isOCRRunning)
+                    .help("Recognize text inside the selected region")
                 }
-                .border(Color.secondary.opacity(0.4))
-                .padding(.horizontal, 12)
+
+                Button {
+                    model.runOCR()
+                } label: {
+                    Label("Get All Text", systemImage: "text.viewfinder")
+                }
+                .buttonStyle(.bordered)
+                .disabled(model.isOCRRunning)
+                .help("Recognize all text in the screenshot")
+
+                Divider().frame(height: 18)
+
+                Button {
+                    model.isDrawing.toggle()
+                    if model.isDrawing { model.selection = nil }
+                } label: {
+                    Label("Draw", systemImage: model.isDrawing ? "pencil.tip.crop.circle.fill" : "pencil.tip.crop.circle")
+                }
+                .buttonStyle(.bordered)
+                .foregroundStyle(model.isDrawing ? .primary : .secondary)
+                .help("Toggle drawing on the screenshot")
+
+                Button {
+                    model.copyImage()
+                } label: {
+                    Label("Copy", systemImage: "doc.on.doc")
+                }
+                .buttonStyle(.bordered)
+                .help("Copy image to clipboard")
+
+                Button {
+                    model.savePNG()
+                } label: {
+                    Label("Save", systemImage: "square.and.arrow.down")
+                }
+                .buttonStyle(.bordered)
+                .help("Save screenshot as PNG");
+
+                Button {
+                    onClose()
+                } label: {
+                    Image(systemName: "xmark.circle.fill")
+                        .foregroundStyle(.secondary)
+                }
+                .buttonStyle(.plain)
+                .help("Close")
+            }
+            .padding(.horizontal, 14)
+            .padding(.vertical, 10)
+
+            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)")
+
+                    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)
+                .background(.bar)
+
+                Divider()
+            }
+
+            // Content
+            if model.mode == .screenshot {
+                ScreenshotPane(model: model)
+                    .padding(12)
             } else {
-                ZStack(alignment: .bottomTrailing) {
+                ZStack {
                     ScrollView {
                         Text(model.displayText)
-                            .font(.system(.body))
+                            .font(.system(.body, design: .monospaced))
                             .textSelection(.enabled)
                             .frame(maxWidth: .infinity, alignment: .leading)
-                            .padding(8)
+                            .padding(12)
                     }
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 6)
-                            .stroke(Color.secondary.opacity(0.4))
-                    )
+                }
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+            }
 
-                    HStack(spacing: 8) {
-                        if let msg = model.statusMessage {
-                            Text(msg)
-                                .font(.caption)
-                                .foregroundColor(.secondary)
-                        }
-                        Button("Copy Text") { model.copyText() }
+            // Status bar
+            HStack(spacing: 8) {
+                if model.isOCRRunning {
+                    ProgressView()
+                        .controlSize(.small)
+                }
+                Text(model.statusMessage ?? (model.mode == .screenshot
+                    ? (model.hasSelection ? "Region selected — click OCR Selection." : "Drag to select a region, or Get All Text.")
+                    : "Selectable text"))
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .lineLimit(1)
+
+                Spacer()
+
+                if model.mode == .text, model.extractedText != nil {
+                    Button {
+                        model.copyText()
+                    } label: {
+                        Label("Copy Text", systemImage: "doc.on.doc")
                     }
-                    .padding(8)
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
                 }
             }
+            .padding(.horizontal, 14)
+            .padding(.vertical, 8)
+            .background(.bar)
+        }
+        .frame(minWidth: 520, minHeight: 420)
+    }
+}
 
-            if model.statusMessage != nil && model.mode == .screenshot {
-                Text(model.statusMessage!)
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .padding(.horizontal, 12)
+struct ScreenshotPane: View {
+    @ObservedObject var model: CaptureModel
+
+    private var imageSize: CGSize {
+        CGSize(width: model.image.width, height: model.image.height)
+    }
+
+    private func geometry(for geo: GeometryProxy) -> (scale: CGFloat, drawSize: CGSize, origin: CGPoint) {
+        let size = imageSize
+        let scale = min(geo.size.width / size.width, geo.size.height / size.height)
+        let drawSize = CGSize(width: size.width * scale, height: size.height * scale)
+        let origin = CGPoint(
+            x: (geo.size.width - drawSize.width) / 2,
+            y: (geo.size.height - drawSize.height) / 2
+        )
+        return (scale, drawSize, origin)
+    }
+
+    private func toImagePoint(_ viewPoint: CGPoint, scale: CGFloat, origin: CGPoint) -> CGPoint {
+        CGPoint(
+            x: (viewPoint.x - origin.x) / scale,
+            y: (viewPoint.y - origin.y) / scale
+        )
+    }
+
+    private func clampSelection(_ rect: CGRect) -> CGRect {
+        rect.intersection(CGRect(origin: .zero, size: imageSize))
+    }
+
+    @State private var currentStroke: [CGPoint] = []
+
+    var body: some View {
+        GeometryReader { geo in
+            let (scale, drawSize, origin) = geometry(for: geo)
+
+            ZStack {
+                Image(nsImage: NSImage(cgImage: model.image, size: .zero))
+                    .resizable()
+                    .interpolation(imageSize.width >= geo.size.width ? .high : .none)
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width: drawSize.width, height: drawSize.height)
+                    .position(x: origin.x + drawSize.width / 2, y: origin.y + drawSize.height / 2)
+
+                // Completed strokes
+                Canvas { context, _ in
+                    for stroke in model.strokes {
+                        guard stroke.points.count > 1 else { continue }
+                        var path = Path()
+                        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)
+                    }
+                }
+                .allowsHitTesting(false)
+
+                // In-progress stroke
+                if !currentStroke.isEmpty {
+                    Canvas { context, _ in
+                        var path = Path()
+                        if currentStroke.count > 1 {
+                            path.move(to: CGPoint(x: origin.x + currentStroke[0].x * scale, y: origin.y + currentStroke[0].y * scale))
+                            for point in currentStroke.dropFirst() {
+                                path.addLine(to: CGPoint(x: origin.x + point.x * scale, y: origin.y + point.y * scale))
+                            }
+                        }
+                        context.stroke(path, with: .color(Color(nsColor: model.drawColor)), lineWidth: model.strokeWidth)
+                    }
+                    .allowsHitTesting(false)
+                }
+
+                if !model.isDrawing, let sel = model.selection {
+                    let viewRect = CGRect(
+                        x: origin.x + sel.minX * scale,
+                        y: origin.y + sel.minY * scale,
+                        width: sel.width * scale,
+                        height: sel.height * scale
+                    )
+                    Rectangle()
+                        .fill(Color.accentColor.opacity(0.15))
+                        .border(Color.accentColor, width: 1.5)
+                        .frame(width: viewRect.width, height: viewRect.height)
+                        .position(x: viewRect.midX, y: viewRect.midY)
+                        .allowsHitTesting(false)
+                }
             }
+            .contentShape(Rectangle())
+            .gesture(
+                DragGesture(minimumDistance: 0)
+                    .onChanged { value in
+                        if model.isDrawing {
+                            let p = toImagePoint(value.location, scale: scale, origin: origin)
+                            let imgRect = CGRect(origin: .zero, size: imageSize)
+                            if imgRect.contains(p) {
+                                currentStroke.append(p)
+                            }
+                        } else {
+                            let start = toImagePoint(value.startLocation, scale: scale, origin: origin)
+                            let current = toImagePoint(value.location, scale: scale, origin: origin)
+                            let rect = CGRect(
+                                x: min(start.x, current.x),
+                                y: min(start.y, current.y),
+                                width: abs(current.x - start.x),
+                                height: abs(current.y - start.y)
+                            )
+                            model.selection = clampSelection(rect)
+                        }
+                    }
+                    .onEnded { _ in
+                        if model.isDrawing {
+                            if currentStroke.count > 1 {
+                                model.addStroke(currentStroke)
+                            }
+                            currentStroke = []
+                        } else {
+                            if let s = model.selection, (s.width < 2 || s.height < 2) {
+                                model.selection = nil
+                            }
+                        }
+                    }
+            )
         }
-        .padding(.bottom, 10)
-        .frame(minWidth: 480, minHeight: 380)
     }
 }

build-app.sh

@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
     <key>CFBundleIconFile</key>
     <string>Icon</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1.7</string>
+    <string>1.5.0</string>
     <key>CFBundleVersion</key>
-    <string>17</string>
+    <string>50</string>
     <key>LSUIElement</key>
     <true/>
     <key>NSHighResolutionCapable</key>