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

ui: strip label color attributes so text uses primary color

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-08 20:00:36 +01:00
parent 2c610258d1
commit 66a8780fa2
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,7 +442,8 @@ private struct VibrantLabelView: NSViewRepresentable {
var onTap: () -> Void var onTap: () -> Void
func makeNSView(context: Context) -> NSView { func makeNSView(context: Context) -> NSView {
let label = NSTextField(labelWithAttributedString: self.attributed) let display = self.attributed.strippingForegroundColor()
let label = NSTextField(labelWithAttributedString: display)
label.isEditable = false label.isEditable = false
label.isBordered = false label.isBordered = false
label.drawsBackground = false label.drawsBackground = false
@@ -471,10 +472,10 @@ private struct VibrantLabelView: NSViewRepresentable {
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 label = container.subviews.first as? NSTextField else { return }
label.attributedStringValue = self.attributed label.attributedStringValue = self.attributed.strippingForegroundColor()
} }
private final class ClickCatcher: NSView { private final class ClickCatcher: NSView {
let onTap: () -> Void let onTap: () -> Void
init(onTap: @escaping () -> Void) { init(onTap: @escaping () -> Void) {
self.onTap = onTap self.onTap = onTap
@@ -491,6 +492,14 @@ private struct VibrantLabelView: NSViewRepresentable {
} }
} }
private extension NSAttributedString {
func strippingForegroundColor() -> NSAttributedString {
let mutable = NSMutableAttributedString(attributedString: self)
mutable.removeAttribute(.foregroundColor, range: NSRange(location: 0, length: mutable.length))
return mutable
}
}
private final class TranscriptNSTextView: NSTextView { private final class TranscriptNSTextView: NSTextView {
var onSend: (() -> Void)? var onSend: (() -> Void)?
var onBeginEditing: (() -> Void)? var onBeginEditing: (() -> Void)?