let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Canvas: add vibrancy close pill

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-17 14:50:29 +01:00
parent fdca8fb592
commit 4482965d80
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/macos/Sources/Clawdis/CanvasWindow.swift
View File

@@ -581,14 +581,32 @@ private final class HoverChromeContainerView: NSView {
private let dragHandle = CanvasDragHandleView(frame: .zero) private let dragHandle = CanvasDragHandleView(frame: .zero)
private let resizeHandle = CanvasResizeHandleView(frame: .zero) private let resizeHandle = CanvasResizeHandleView(frame: .zero)
private final class PassthroughVisualEffectView: NSVisualEffectView {
override func hitTest(_: NSPoint) -> NSView? { nil }
}
private let closeBackground: NSVisualEffectView = {
let v = PassthroughVisualEffectView(frame: .zero)
v.material = .hudWindow
v.blendingMode = .withinWindow
v.state = .active
v.wantsLayer = true
v.layer?.cornerRadius = 12
v.layer?.masksToBounds = true
v.layer?.borderWidth = 1
v.layer?.borderColor = NSColor.white.withAlphaComponent(0.12).cgColor
return v
}()
private let closeButton: NSButton = { private let closeButton: NSButton = {
let img = NSImage(systemSymbolName: "xmark.circle.fill", accessibilityDescription: "Close") let img = NSImage(systemSymbolName: "xmark", accessibilityDescription: "Close")
?? NSImage(size: NSSize(width: 18, height: 18)) ?? NSImage(size: NSSize(width: 18, height: 18))
let btn = NSButton(image: img, target: nil, action: nil) let btn = NSButton(image: img, target: nil, action: nil)
btn.isBordered = false btn.isBordered = false
btn.bezelStyle = .regularSquare btn.bezelStyle = .regularSquare
btn.imageScaling = .scaleProportionallyDown btn.imageScaling = .scaleProportionallyDown
btn.contentTintColor = NSColor.secondaryLabelColor btn.contentTintColor = NSColor.labelColor
btn.toolTip = "Close" btn.toolTip = "Close"
return btn return btn
}() }()
@@ -613,6 +631,9 @@ private final class HoverChromeContainerView: NSView {
self.resizeHandle.layer?.backgroundColor = NSColor.clear.cgColor self.resizeHandle.layer?.backgroundColor = NSColor.clear.cgColor
self.addSubview(self.resizeHandle) self.addSubview(self.resizeHandle)
self.closeBackground.translatesAutoresizingMaskIntoConstraints = false
self.addSubview(self.closeBackground)
self.closeButton.translatesAutoresizingMaskIntoConstraints = false self.closeButton.translatesAutoresizingMaskIntoConstraints = false
self.closeButton.target = self self.closeButton.target = self
self.closeButton.action = #selector(self.handleClose) self.closeButton.action = #selector(self.handleClose)
@@ -624,6 +645,11 @@ private final class HoverChromeContainerView: NSView {
self.dragHandle.topAnchor.constraint(equalTo: self.topAnchor), self.dragHandle.topAnchor.constraint(equalTo: self.topAnchor),
self.dragHandle.heightAnchor.constraint(equalToConstant: 30), self.dragHandle.heightAnchor.constraint(equalToConstant: 30),
self.closeBackground.centerXAnchor.constraint(equalTo: self.closeButton.centerXAnchor),
self.closeBackground.centerYAnchor.constraint(equalTo: self.closeButton.centerYAnchor),
self.closeBackground.widthAnchor.constraint(equalToConstant: 24),
self.closeBackground.heightAnchor.constraint(equalToConstant: 24),
self.closeButton.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -8), self.closeButton.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -8),
self.closeButton.topAnchor.constraint(equalTo: self.topAnchor, constant: 8), self.closeButton.topAnchor.constraint(equalTo: self.topAnchor, constant: 8),
self.closeButton.widthAnchor.constraint(equalToConstant: 18), self.closeButton.widthAnchor.constraint(equalToConstant: 18),