Add frozen-screen capture on Ctrl+Shift+Cmd+S
A second hotkey snapshots every display the moment it is pressed and
shows that still image as the overlay, so the pointer and hover states
(tooltips, open menus) are captured. Selection is marquee-only — no
window detection — and the result is cropped from the snapshot rather
than recaptured, keeping the frame exactly as it was.
💘 Generated with Crush
Assisted-by: Crush:deepseek-v4-flash-0731
This commit is contained in:
@@ -30,6 +30,9 @@ final class OverlayWindow: NSPanel {
|
||||
|
||||
final class OverlayView: NSView {
|
||||
weak var controller: CaptureController?
|
||||
/// In frozen mode: the still image to display for this screen (already
|
||||
/// full resolution). Nil = live mode (dim the real screen).
|
||||
var frozenImage: CGImage?
|
||||
|
||||
override var acceptsFirstResponder: Bool { true }
|
||||
|
||||
@@ -56,9 +59,42 @@ final class OverlayView: NSView {
|
||||
)
|
||||
}
|
||||
|
||||
/// Draw the frozen snapshot filling the screen, then replace its centre
|
||||
/// hole with the live... no: the image IS the content, drawn opaque.
|
||||
private func drawFrozen(_ image: CGImage) {
|
||||
guard let ctx = NSGraphicsContext.current?.cgContext else { return }
|
||||
ctx.saveGState()
|
||||
ctx.interpolationQuality = .high
|
||||
// Image is in pixels, view in points — draw into the view bounds.
|
||||
ctx.draw(image, in: bounds)
|
||||
ctx.restoreGState()
|
||||
}
|
||||
|
||||
private func drawSizeLabel(for sel: NSRect, in vf: NSRect) {
|
||||
let label = "\(Int(sel.width)) × \(Int(sel.height))"
|
||||
let attrs: [NSAttributedString.Key: Any] = [
|
||||
.font: NSFont.monospacedDigitSystemFont(ofSize: 12, weight: .medium),
|
||||
.foregroundColor: NSColor.white,
|
||||
]
|
||||
let labelSize = label.size(withAttributes: attrs)
|
||||
let labelRect = NSRect(
|
||||
x: vf.maxX - labelSize.width - 8,
|
||||
y: vf.minY - labelSize.height - 10,
|
||||
width: labelSize.width + 8,
|
||||
height: labelSize.height + 6
|
||||
)
|
||||
NSColor.black.withAlphaComponent(0.6).setFill()
|
||||
NSBezierPath(roundedRect: labelRect, xRadius: 4, yRadius: 4).fill()
|
||||
label.draw(at: NSPoint(x: labelRect.minX + 4, y: labelRect.minY + 3), withAttributes: attrs)
|
||||
}
|
||||
|
||||
override func draw(_ dirtyRect: NSRect) {
|
||||
NSColor.black.withAlphaComponent(0.35).setFill()
|
||||
NSBezierPath(rect: bounds).fill()
|
||||
if let frozenImage {
|
||||
drawFrozen(frozenImage)
|
||||
} else {
|
||||
NSColor.black.withAlphaComponent(0.35).setFill()
|
||||
NSBezierPath(rect: bounds).fill()
|
||||
}
|
||||
|
||||
// Esc hint — the only way out once clicks are consumed by the tap.
|
||||
let hint = "Drag to select · hover + click a window to capture it · Esc to cancel"
|
||||
@@ -79,6 +115,33 @@ final class OverlayView: NSView {
|
||||
|
||||
guard let controller else { return }
|
||||
|
||||
// Frozen mode: no window highlight; the marquee is cut straight out
|
||||
// of the still image so it shows the frozen pixels.
|
||||
if frozenImage != nil {
|
||||
if let sel = controller.marqueeRect, sel.width > 0, sel.height > 0 {
|
||||
let vf = viewRect(sel)
|
||||
// Dim everything except the selection (even-odd fill).
|
||||
let maskPath = CGMutablePath()
|
||||
maskPath.addRect(bounds)
|
||||
maskPath.addRect(vf)
|
||||
NSGraphicsContext.current?.saveGraphicsState()
|
||||
let ctx = NSGraphicsContext.current?.cgContext
|
||||
ctx?.addPath(maskPath)
|
||||
ctx?.fillPath(using: .evenOdd)
|
||||
NSColor.black.withAlphaComponent(0.35).setFill()
|
||||
ctx?.addPath(maskPath)
|
||||
ctx?.fillPath(using: .evenOdd)
|
||||
NSGraphicsContext.current?.restoreGraphicsState()
|
||||
|
||||
let border = NSBezierPath(rect: vf)
|
||||
border.lineWidth = 1.5
|
||||
NSColor.controlAccentColor.setStroke()
|
||||
border.stroke()
|
||||
drawSizeLabel(for: sel, in: vf)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Highlight the hovered window (rounded, like real window corners)
|
||||
if let frame = controller.hoverFrame {
|
||||
let vf = viewRect(frame)
|
||||
|
||||
Reference in New Issue
Block a user