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

ux: keep vibrancy, brighten label, ensure wrapping

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-08 19:36:48 +01:00
parent 1d385fd35a
commit 421d6db592
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,7 +324,7 @@ private struct VoiceWakeOverlayView: View {
.padding(.vertical, 8) .padding(.vertical, 8)
.padding(.horizontal, 10) .padding(.horizontal, 10)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.background(Color(nsColor: .windowBackgroundColor)) .background(.regularMaterial)
.clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous)) .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
.onAppear { self.textFocused = false } .onAppear { self.textFocused = false }
.onChange(of: self.controller.model.text) { _, _ in .onChange(of: self.controller.model.text) { _, _ in
@@ -452,24 +452,38 @@ private struct VibrantLabelView: NSViewRepresentable {
label.cell?.wraps = true label.cell?.wraps = true
label.cell?.isScrollable = false label.cell?.isScrollable = false
label.setContentHuggingPriority(.defaultLow, for: .horizontal) label.setContentHuggingPriority(.defaultLow, for: .horizontal)
label.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) label.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
label.textColor = .labelColor label.textColor = .labelColor
let effect = NSVisualEffectView()
effect.material = .hudWindow
effect.blendingMode = .withinWindow
effect.state = .active
effect.translatesAutoresizingMaskIntoConstraints = false
effect.addSubview(label)
let container = ClickCatcher(onTap: onTap) let container = ClickCatcher(onTap: onTap)
container.addSubview(label) container.addSubview(effect)
label.translatesAutoresizingMaskIntoConstraints = false label.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
label.leadingAnchor.constraint(equalTo: container.leadingAnchor), effect.leadingAnchor.constraint(equalTo: container.leadingAnchor),
label.trailingAnchor.constraint(equalTo: container.trailingAnchor), effect.trailingAnchor.constraint(equalTo: container.trailingAnchor),
label.topAnchor.constraint(equalTo: container.topAnchor), effect.topAnchor.constraint(equalTo: container.topAnchor),
label.bottomAnchor.constraint(equalTo: container.bottomAnchor), effect.bottomAnchor.constraint(equalTo: container.bottomAnchor),
label.leadingAnchor.constraint(equalTo: effect.leadingAnchor),
label.trailingAnchor.constraint(equalTo: effect.trailingAnchor),
label.topAnchor.constraint(equalTo: effect.topAnchor),
label.bottomAnchor.constraint(equalTo: effect.bottomAnchor),
]) ])
return container return container
} }
func updateNSView(_ nsView: NSView, context: Context) { func updateNSView(_ nsView: NSView, context: Context) {
guard let container = nsView as? ClickCatcher, guard let container = nsView as? ClickCatcher,
let label = container.subviews.first as? NSTextField else { return } let effect = container.subviews.first as? NSVisualEffectView,
let label = effect.subviews.first as? NSTextField else { return }
label.attributedStringValue = self.attributed label.attributedStringValue = self.attributed
} }