From 1961d0dc9c59d9fd37da7e01df3c7f5a97746972 Mon Sep 17 00:00:00 2001
From: TZGyn <spectator_brethren761@slmails.com>
Date: Sun, 23 Aug 2026 13:55:00 +0800
Subject: [PATCH] Move draw controls into the draw toolbar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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/ResultWindow.swift | 45 ++----------------------------
 build-app.sh                       |  4 +--
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/Sources/Kapture/ResultWindow.swift b/Sources/Kapture/ResultWindow.swift
index 9524bda..559bf0b 100644
--- a/Sources/Kapture/ResultWindow.swift
+++ b/Sources/Kapture/ResultWindow.swift
@@ -305,49 +305,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 +374,7 @@ struct ResultView: View {
                     .buttonStyle(.bordered)
                     .controlSize(.small)
                     .disabled(!model.canUndo)
+                    .keyboardShortcut("z", modifiers: .command)
                     .help("Undo last stroke (⌘Z)")
 
                     Button {
@@ -427,6 +385,7 @@ struct ResultView: View {
                     .buttonStyle(.bordered)
                     .controlSize(.small)
                     .disabled(!model.canRedo)
+                    .keyboardShortcut("z", modifiers: [.command, .shift])
                     .help("Redo stroke (⌘⇧Z)")
                 }
                 .padding(.horizontal, 14)
diff --git a/build-app.sh b/build-app.sh
index d19934a..13b4921 100755
--- a/build-app.sh
+++ b/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.1</string>
     <key>CFBundleVersion</key>
-    <string>40</string>
+    <string>41</string>
     <key>LSUIElement</key>
     <true/>
     <key>NSHighResolutionCapable</key>