Fix multi-display window detection and click-to-capture; separate Redact tool
Window frames are now converted to AppKit space once at detection time, so
hover highlighting and picking work on every display. A click is only
treated as a drag after 4pt of movement, so clicking a detected window
captures it instead of passing a stray marquee. Redact is now a standalone
tool (Select/Draw/Redact) with its own toolbar hints instead of a toggle
inside the draw bar.
💘 Generated with Crush
Assisted-by: Crush:deepseek-v4-flash-0731
This commit is contained in:
@@ -95,14 +95,18 @@ final class CaptureModel: ObservableObject {
|
||||
/// Redo stack of removed strokes
|
||||
@Published var redoStack: [Stroke] = []
|
||||
/// Whether the pen is active (drag draws instead of selecting)
|
||||
@Published var isDrawing = false
|
||||
/// Whether drawing redacts (black bar) instead of pen strokes
|
||||
@Published var isRedacting = false
|
||||
@Published var tool: Tool = .select
|
||||
/// Current drawing color
|
||||
@Published var drawColor: NSColor = .systemRed
|
||||
/// Stroke thickness in points (image space)
|
||||
@Published var strokeWidth: CGFloat = 3.0
|
||||
|
||||
enum Tool {
|
||||
case select
|
||||
case draw
|
||||
case redact
|
||||
}
|
||||
|
||||
struct Stroke {
|
||||
let points: [CGPoint]
|
||||
let width: CGFloat
|
||||
@@ -193,7 +197,7 @@ final class CaptureModel: ObservableObject {
|
||||
|
||||
func addStroke(_ points: [CGPoint]) {
|
||||
guard points.count > 1 else { return }
|
||||
if isRedacting {
|
||||
if tool == .redact {
|
||||
// Redaction: a filled black bar from start to end, as thick as the
|
||||
// current stroke width (drawn as a rect for clean edges).
|
||||
strokes.append(Stroke(points: points, width: max(strokeWidth, 12), color: .black, isRedaction: true))
|
||||
@@ -333,14 +337,24 @@ struct ResultView: View {
|
||||
Divider().frame(height: 18)
|
||||
|
||||
Button {
|
||||
model.isDrawing.toggle()
|
||||
if model.isDrawing { model.selection = nil }
|
||||
model.tool = model.tool == .draw ? .select : .draw
|
||||
if model.tool != .select { model.selection = nil }
|
||||
} label: {
|
||||
Label("Draw", systemImage: model.isDrawing ? "pencil.tip.crop.circle.fill" : "pencil.tip.crop.circle")
|
||||
Label("Draw", systemImage: model.tool == .draw ? "pencil.tip.crop.circle.fill" : "pencil.tip.crop.circle")
|
||||
}
|
||||
.buttonStyle(.bordered)
|
||||
.foregroundStyle(model.isDrawing ? .primary : .secondary)
|
||||
.help("Toggle drawing on the screenshot")
|
||||
.foregroundStyle(model.tool == .draw ? .primary : .secondary)
|
||||
.help("Draw on the screenshot")
|
||||
|
||||
Button {
|
||||
model.tool = model.tool == .redact ? .select : .redact
|
||||
if model.tool != .select { model.selection = nil }
|
||||
} label: {
|
||||
Label("Redact", systemImage: model.tool == .redact ? "rectangle.fill.on.rectangle.fill" : "rectangle.dashed")
|
||||
}
|
||||
.buttonStyle(.bordered)
|
||||
.foregroundStyle(model.tool == .redact ? .primary : .secondary)
|
||||
.help("Cover sensitive areas with black bars")
|
||||
|
||||
Button {
|
||||
model.copyImage()
|
||||
@@ -372,20 +386,16 @@ struct ResultView: View {
|
||||
|
||||
Divider()
|
||||
|
||||
// Draw toolbar (only when drawing)
|
||||
if model.isDrawing {
|
||||
// Tool toolbar (only when a draw tool is active)
|
||||
if model.tool != .select {
|
||||
HStack(spacing: 14) {
|
||||
Picker("", selection: $model.isRedacting) {
|
||||
Label("Pen", systemImage: "pencil.tip").tag(false)
|
||||
Label("Redact", systemImage: "rectangle.fill").tag(true)
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
.fixedSize()
|
||||
.help("Pen draws strokes; Redact covers text with a black bar")
|
||||
Label(model.tool == .redact ? "Redact" : "Draw", systemImage: model.tool == .redact ? "rectangle.fill" : "pencil.tip")
|
||||
.font(.caption)
|
||||
.foregroundStyle(.secondary)
|
||||
|
||||
Divider().frame(height: 18)
|
||||
|
||||
if !model.isRedacting {
|
||||
if model.tool == .draw {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "circle.fill").font(.system(size: 4))
|
||||
Image(systemName: "circle.fill").font(.system(size: 7))
|
||||
@@ -405,6 +415,10 @@ struct ResultView: View {
|
||||
.labelsHidden()
|
||||
.frame(width: 28)
|
||||
.help("Drawing color")
|
||||
} else {
|
||||
Label("Drag to cover sensitive text", systemImage: "eye.slash")
|
||||
.font(.caption)
|
||||
.foregroundStyle(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
@@ -582,7 +596,7 @@ struct ScreenshotPane: View {
|
||||
.allowsHitTesting(false)
|
||||
}
|
||||
|
||||
if !model.isDrawing, let sel = model.selection {
|
||||
if model.tool == .select, let sel = model.selection {
|
||||
let viewRect = CGRect(
|
||||
x: origin.x + sel.minX * scale,
|
||||
y: origin.y + sel.minY * scale,
|
||||
@@ -601,7 +615,7 @@ struct ScreenshotPane: View {
|
||||
.gesture(
|
||||
DragGesture(minimumDistance: 0)
|
||||
.onChanged { value in
|
||||
if model.isDrawing {
|
||||
if model.tool != .select {
|
||||
let p = toImagePoint(value.location, scale: scale, origin: origin)
|
||||
let imgRect = CGRect(origin: .zero, size: imageSize)
|
||||
if imgRect.contains(p) {
|
||||
@@ -620,7 +634,7 @@ struct ScreenshotPane: View {
|
||||
}
|
||||
}
|
||||
.onEnded { _ in
|
||||
if model.isDrawing {
|
||||
if model.tool != .select {
|
||||
if currentStroke.count > 1 {
|
||||
model.addStroke(currentStroke)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user