Compare commits

..
3 Commits
Author SHA1 Message Date
TZGyn 1327b61e2b Request capture pixels from the selection screen's backing scale
SCDisplay.width is in points, not pixels: the previous fix sent point
counts to SCStreamConfiguration, producing blurry main-screen captures and
failed secondary-screen captures. Multiply by the backing scale factor of
the screen containing the selection (defaulting to 1x, never forcing 2x).

💘 Generated with Crush

Assisted-by: Crush:deepseek-v4-flash-0731
2026-08-12 16:37:53 +08:00
TZGyn c9a807e8a0 Fix secondary display captures after retina scaling change
The 1.1.2 retina fix overrode the stream width from the display's pixel
dimensions, which made captures on secondary monitors come out at the
wrong scale or offset. Restore requesting the display's native pixel
resolution and keep the crop scale derived from the actual returned image,
plus guard against out-of-bounds crop rects.

💘 Generated with Crush

Assisted-by: Crush:deepseek-v4-flash-0731
2026-08-12 16:34:18 +08:00
TZGyn 7bc93c2014 Anti-alias downscaled screenshots in the result window
Full-res retina captures are downscaled to fit the window; nearest-neighbor
made them look chunky. Use high-quality interpolation when shrinking, keep
pixel-crisp rendering only when upscaling small selections.

💘 Generated with Crush

Assisted-by: Crush:deepseek-v4-flash-0731
2026-08-12 16:25:23 +08:00
3 changed files with 31 additions and 19 deletions
+19 -11
View File
@@ -86,10 +86,12 @@ final class ScreenCapture {
@available(macOS 14.0, *) @available(macOS 14.0, *)
private func crop(_ image: CGImage, to rect: NSRect, display: SCDisplay) -> CGImage? { private func crop(_ image: CGImage, to rect: NSRect, display: SCDisplay) -> CGImage? {
// Scale from the actual captured image dimensions, which reflect the // The captured image may be at any scale (retina 2x, secondary display
// stream's pixel output (retina => 2x, non-retina => 1x). // 1x, or trimmed by ScreenCaptureKit). Derive the pixel scale from the
// image we actually got, relative to the display's point frame.
let scaleX = CGFloat(image.width) / display.frame.width let scaleX = CGFloat(image.width) / display.frame.width
let scaleY = CGFloat(image.height) / display.frame.height let scaleY = CGFloat(image.height) / display.frame.height
guard scaleX > 0, scaleY > 0 else { return nil }
let cgRect = CGRect( let cgRect = CGRect(
x: rect.minX, x: rect.minX,
y: rect.minY, y: rect.minY,
@@ -102,14 +104,18 @@ final class ScreenCapture {
width: cgRect.width * scaleX, width: cgRect.width * scaleX,
height: cgRect.height * scaleY height: cgRect.height * scaleY
) )
// Guard against negative offsets when the selection reaches beyond the
// 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( guard let cropCtx = CGContext(
data: nil, width: Int(pxRect.width), height: Int(pxRect.height), data: nil, width: Int(safeRect.width), height: Int(safeRect.height),
bitsPerComponent: 8, bytesPerRow: 0, bitsPerComponent: 8, bytesPerRow: 0,
space: CGColorSpaceCreateDeviceRGB(), space: CGColorSpaceCreateDeviceRGB(),
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
) else { return nil } ) else { return nil }
cropCtx.interpolationQuality = .high cropCtx.interpolationQuality = .high
cropCtx.draw(image, in: CGRect(x: -pxRect.minX, y: -pxRect.minY, width: CGFloat(image.width), height: CGFloat(image.height))) cropCtx.draw(image, in: CGRect(x: -safeRect.minX, y: -safeRect.minY, width: CGFloat(image.width), height: CGFloat(image.height)))
return cropCtx.makeImage() return cropCtx.makeImage()
} }
@@ -135,13 +141,15 @@ final class ScreenCapture {
let excluded = content.windows.filter { excludedSet.contains($0.windowID) } let excluded = content.windows.filter { excludedSet.contains($0.windowID) }
let filter = SCContentFilter(display: display, excludingWindows: excluded) let filter = SCContentFilter(display: display, excludingWindows: excluded)
let config = SCStreamConfiguration() let config = SCStreamConfiguration()
// width/height are in points. Use the display's backing scale so // SCDisplay.width/height are in POINTS; SCStreamConfiguration
// retina captures come out at full pixel resolution. // width/height are output PIXELS. Multiply by the backing scale
let backingScale = NSScreen.screens.first(where: { $0.frame.contains( // of the screen containing the selection so retina displays are
NSPoint(x: rect.midX, y: rect.midY) // captured at full resolution and 1x displays stay 1x.
) })?.backingScaleFactor ?? 2 let backingScale = NSScreen.screens
config.width = Int(display.frame.width * backingScale) .first(where: { $0.frame.contains(NSPoint(x: rect.midX, y: rect.midY)) })?
config.height = Int(display.frame.height * backingScale) .backingScaleFactor ?? 1
config.width = Int(CGFloat(display.width) * backingScale)
config.height = Int(CGFloat(display.height) * backingScale)
config.showsCursor = true config.showsCursor = true
guard let image = try? await SCScreenshotManager.captureImage(contentFilter: filter, configuration: config) else { guard let image = try? await SCScreenshotManager.captureImage(contentFilter: filter, configuration: config) else {
+5 -1
View File
@@ -193,10 +193,14 @@ struct ResultView: View {
.padding(.top, 10) .padding(.top, 10)
if model.mode == .screenshot { if model.mode == .screenshot {
GeometryReader { geo in
let imageWidth = CGFloat(model.image.width)
Image(nsImage: NSImage(cgImage: model.image, size: .zero)) Image(nsImage: NSImage(cgImage: model.image, size: .zero))
.resizable() .resizable()
.interpolation(.none) // Downscale with smoothing (AA); upscale keeps pixels crisp.
.interpolation(imageWidth >= geo.size.width ? .high : .none)
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
}
.border(Color.secondary.opacity(0.4)) .border(Color.secondary.opacity(0.4))
.padding(.horizontal, 12) .padding(.horizontal, 12)
} else { } else {
+2 -2
View File
@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Icon</string> <string>Icon</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.1.2</string> <string>1.1.5</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>12</string> <string>15</string>
<key>LSUIElement</key> <key>LSUIElement</key>
<true/> <true/>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>