Skip to content

Clamp Settings window away from display edge #3436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lawrencecchen merged 2 commits into from
May 2, 2026
Merged

Clamp Settings window away from display edge #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5319a72
Clamp Settings window away from display edge
lawrencecchen May 2, 2026
7c1da75
Merge remote-tracking branch 'origin/main' into feat-settings-traffic…
lawrencecchen May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions Sources/WindowDecorationsController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import AppKit
final class WindowDecorationsController {
private var observers: [NSObjectProtocol] = []
private var didStart = false
private var trafficLightBaseFrames: [ObjectIdentifier: [NSWindow.ButtonType: NSRect]] = [:]
private var minimalModeSidebarChromeHoverMonitor: Any?
private var lastMinimalModeTitlebarClick: MinimalModeTitlebarClickRecord?
private var lastKnownPresentationMode = WorkspacePresentationModeSettings.mode()
Expand Down Expand Up @@ -43,7 +42,6 @@ final class WindowDecorationsController {
}
let shouldHideButtons = shouldHideTrafficLights(for: window)
hideStandardButtons(on: window, hidden: shouldHideButtons)
applyTrafficLightOffset(on: window, hidden: shouldHideButtons)
applyMinimalModeSidebarTitlebarClickTarget(to: window)
}

Expand Down Expand Up @@ -359,34 +357,6 @@ final class WindowDecorationsController {
window.standardWindowButton(.zoomButton)?.isHidden = hidden
}

private func applyTrafficLightOffset(on window: NSWindow, hidden: Bool) {
DispatchQueue.main.async { [weak self, weak window] in
guard let self, let window else { return }
let offset = hidden ? NSPoint.zero : self.trafficLightOffset(for: window)
self.applyTrafficLightOffsetNow(on: window, offset: offset)
}
}

private func applyTrafficLightOffsetNow(on window: NSWindow, offset: NSPoint) {
let key = ObjectIdentifier(window)
let buttonTypes: [NSWindow.ButtonType] = [.closeButton, .miniaturizeButton, .zoomButton]
var baseFrames = trafficLightBaseFrames[key] ?? [:]

for type in buttonTypes {
guard let button = window.standardWindowButton(type) else { continue }
if baseFrames[type] == nil || (baseFrames[type]?.isEmpty ?? true) {
baseFrames[type] = button.frame
}
}

trafficLightBaseFrames[key] = baseFrames

for type in buttonTypes {
guard let button = window.standardWindowButton(type), let base = baseFrames[type] else { continue }
button.setFrameOrigin(NSPoint(x: base.origin.x + offset.x, y: base.origin.y + offset.y))
}
}

private func applyMinimalModeSidebarTitlebarClickTarget(to window: NSWindow) {
let shouldInstall = isMainWorkspaceWindow(window)
&& WorkspacePresentationModeSettings.isMinimal()
Expand Down Expand Up @@ -460,10 +430,6 @@ final class WindowDecorationsController {
minimalModeSidebarTitlebarClickTargets.removeObject(forKey: window)
}

private func trafficLightOffset(for window: NSWindow) -> NSPoint {
return .zero
}

private func shouldHideTrafficLights(for window: NSWindow) -> Bool {
if window.isSheet {
return true
Expand Down
22 changes: 22 additions & 0 deletions Sources/cmuxApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,6 +2490,7 @@ enum SettingsWindowPresenter {
static let windowID = "settings"
static let windowIdentifier = "cmux.settings"
static let minimumSize = NSSize(width: 820, height: 540)
private static let visibleAreaInset: CGFloat = 18

private static var openWindow: (@MainActor () -> Void)?
private static weak var settingsWindow: NSWindow?
Expand All @@ -2507,8 +2508,10 @@ enum SettingsWindowPresenter {
static func configure(window: NSWindow) {
settingsWindow = window
window.identifier = NSUserInterfaceItemIdentifier(windowIdentifier)
window.isRestorable = false
window.minSize = minimumSize
window.contentMinSize = minimumSize
clampToVisibleAreaIfNeeded(window)
}

static func show(navigationTarget: SettingsNavigationTarget? = nil) {
Expand Down Expand Up @@ -2561,10 +2564,29 @@ enum SettingsWindowPresenter {
if window.isMiniaturized {
window.deminiaturize(nil)
}
clampToVisibleAreaIfNeeded(window)
NSRunningApplication.current.activate(options: [.activateAllWindows])
window.makeKeyAndOrderFront(nil)
window.orderFrontRegardless()
}

private static func clampToVisibleAreaIfNeeded(_ window: NSWindow) {
guard let screen = window.screen ?? NSScreen.main else { return }
var frame = window.frame
let visibleFrame = screen.visibleFrame
let minX = visibleFrame.minX + visibleAreaInset
let minY = visibleFrame.minY + visibleAreaInset
let maxX = max(minX, visibleFrame.maxX - visibleAreaInset - frame.width)
let maxY = max(minY, visibleFrame.maxY - visibleAreaInset - frame.height)
let clampedOrigin = NSPoint(
x: min(max(frame.origin.x, minX), maxX),
y: min(max(frame.origin.y, minY), maxY)
)

guard clampedOrigin != frame.origin else { return }
frame.origin = clampedOrigin
window.setFrame(frame, display: true)
}
}

// MARK: - File Explorer Style Debug
Expand Down