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

fix(mac): keep voice overlay above canvas

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-12 21:26:04 +00:00
parent 1d41129b6c
commit ce8db12b22
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
self.watcher = CanvasFileWatcher(url: self.sessionDir) { [weak webView] in self.watcher = CanvasFileWatcher(url: self.sessionDir) { [weak webView] in
Task { @MainActor in Task { @MainActor in
// Only auto-reload when we are showing local canvas content.
guard webView?.url?.scheme == CanvasScheme.scheme else { return }
webView?.reload() webView?.reload()
} }
} }
@@ -127,11 +129,19 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
} }
func goto(path: String) { func goto(path: String) {
guard let url = CanvasScheme.makeURL(session: CanvasWindowController.sanitizeSessionKey(self.sessionKey), path: path) else { let trimmed = path.trimmingCharacters(in: .whitespacesAndNewlines)
canvasWindowLogger.error("invalid canvas url session=\(self.sessionKey, privacy: .public) path=\(path, privacy: .public)")
if let url = URL(string: trimmed), let scheme = url.scheme?.lowercased(), scheme == "https" || scheme == "http" {
canvasWindowLogger.debug("canvas goto web \(url.absoluteString, privacy: .public)")
self.webView.load(URLRequest(url: url))
return return
} }
canvasWindowLogger.debug("canvas goto \(url.absoluteString, privacy: .public)")
guard let url = CanvasScheme.makeURL(session: CanvasWindowController.sanitizeSessionKey(self.sessionKey), path: trimmed) else {
canvasWindowLogger.error("invalid canvas url session=\(self.sessionKey, privacy: .public) path=\(trimmed, privacy: .public)")
return
}
canvasWindowLogger.debug("canvas goto canvas \(url.absoluteString, privacy: .public)")
self.webView.load(URLRequest(url: url)) self.webView.load(URLRequest(url: url))
} }
@@ -300,7 +310,8 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
decisionHandler(.cancel) decisionHandler(.cancel)
return return
} }
if url.scheme == CanvasScheme.scheme { let scheme = url.scheme?.lowercased()
if scheme == CanvasScheme.scheme || scheme == "https" || scheme == "http" {
decisionHandler(.allow) decisionHandler(.allow)
return return
} }

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

@@ -308,7 +308,9 @@ final class VoiceWakeOverlayController: ObservableObject {
panel.isOpaque = false panel.isOpaque = false
panel.backgroundColor = .clear panel.backgroundColor = .clear
panel.hasShadow = false panel.hasShadow = false
panel.level = .statusBar // Voice wake must stay above any other Clawdis windows (Canvas, WebChat, notifications).
// `.statusBar` is shared with some other overlays, so bump it slightly to avoid ordering fights.
panel.level = NSWindow.Level(rawValue: NSWindow.Level.statusBar.rawValue + 2)
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient] panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
panel.hidesOnDeactivate = false panel.hidesOnDeactivate = false
panel.isMovable = false panel.isMovable = false