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

fix(macos): clamp web chat to visible frame

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-13 22:38:10 +00:00
parent ceb3980b93
commit ece8a3e701
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1113,11 +1113,18 @@ final class WebChatSwiftUIWindowController {
} ?? NSScreen.main } ?? NSScreen.main
var frame = window.frame var frame = window.frame
if let screen { if let screen {
let minX = screen.frame.minX + WebChatSwiftUILayout.anchorPadding let bounds = screen.visibleFrame.insetBy(
let maxX = screen.frame.maxX - frame.width - WebChatSwiftUILayout.anchorPadding dx: WebChatSwiftUILayout.anchorPadding,
frame.origin.x = min(max(round(anchor.midX - frame.width / 2), minX), maxX) dy: WebChatSwiftUILayout.anchorPadding)
let desiredX = round(anchor.midX - frame.width / 2)
let desiredY = anchor.minY - frame.height - WebChatSwiftUILayout.anchorPadding let desiredY = anchor.minY - frame.height - WebChatSwiftUILayout.anchorPadding
frame.origin.y = max(desiredY, screen.frame.minY + WebChatSwiftUILayout.anchorPadding)
let maxX = bounds.maxX - frame.width
let maxY = bounds.maxY - frame.height
frame.origin.x = maxX >= bounds.minX ? min(max(desiredX, bounds.minX), maxX) : bounds.minX
frame.origin.y = maxY >= bounds.minY ? min(max(desiredY, bounds.minY), maxY) : bounds.minY
} else { } else {
frame.origin.x = round(anchor.midX - frame.width / 2) frame.origin.x = round(anchor.midX - frame.width / 2)
frame.origin.y = anchor.minY - frame.height frame.origin.y = anchor.minY - frame.height

13
apps/macos/Sources/Clawdis/WebChatWindow.swift
View File

@@ -347,11 +347,16 @@ final class WebChatWindowController: NSWindowController, WKNavigationDelegate, N
} ?? NSScreen.main } ?? NSScreen.main
if let screen { if let screen {
let minX = screen.frame.minX + WebChatLayout.anchorPadding let bounds = screen.visibleFrame.insetBy(dx: WebChatLayout.anchorPadding, dy: WebChatLayout.anchorPadding)
let maxX = screen.frame.maxX - frame.width - WebChatLayout.anchorPadding
frame.origin.x = min(max(round(anchor.midX - frame.width / 2), minX), maxX) let desiredX = round(anchor.midX - frame.width / 2)
let desiredY = anchor.minY - frame.height - WebChatLayout.anchorPadding let desiredY = anchor.minY - frame.height - WebChatLayout.anchorPadding
frame.origin.y = max(desiredY, screen.frame.minY + WebChatLayout.anchorPadding)
let maxX = bounds.maxX - frame.width
let maxY = bounds.maxY - frame.height
frame.origin.x = maxX >= bounds.minX ? min(max(desiredX, bounds.minX), maxX) : bounds.minX
frame.origin.y = maxY >= bounds.minY ? min(max(desiredY, bounds.minY), maxY) : bounds.minY
} else { } else {
frame.origin.x = round(anchor.midX - frame.width / 2) frame.origin.x = round(anchor.midX - frame.width / 2)
frame.origin.y = anchor.minY - frame.height frame.origin.y = anchor.minY - frame.height