Skip to content

ensure that new chat windows use the previously active window size #646

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
tpae merged 2 commits into from
Mar 19, 2026
Merged

ensure that new chat windows use the previously active window size #646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e5f178
ensure that new chat windows use the previously active window size
RaajeevChandran Mar 15, 2026
e9ef6a7
better DRY refactor of ChatWindowManager
RaajeevChandran Mar 15, 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
143 changes: 56 additions & 87 deletions Packages/OsaurusCore/Managers/ChatWindowManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,77 +373,10 @@ public final class ChatWindowManager: NSObject, ObservableObject {

let hostingController = NSHostingController(rootView: chatView)

// Calculate centered position on active screen
let defaultSize = NSSize(width: 800, height: 610)
let mouse = NSEvent.mouseLocation
let screen = NSScreen.screens.first { NSMouseInRect(mouse, $0.frame, false) } ?? NSScreen.main

let cascadeOffset = CGFloat(windows.count) * 25.0

let initialRect: NSRect
if let s = screen {
let vf = s.visibleFrame
let baseOrigin = NSPoint(
x: vf.midX - defaultSize.width / 2,
y: vf.midY - defaultSize.height / 2
)
var origin = NSPoint(
x: baseOrigin.x + cascadeOffset,
y: baseOrigin.y - cascadeOffset
)
if origin.x + defaultSize.width > vf.maxX {
origin.x = vf.minX + 50
}
if origin.y < vf.minY {
origin.y = vf.maxY - defaultSize.height - 50
}
initialRect = NSRect(origin: origin, size: defaultSize)
} else {
initialRect = NSRect(origin: .zero, size: defaultSize)
}

let panel = ChatPanel(
contentRect: initialRect,
styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
backing: .buffered,
defer: false
)

panel.isOpaque = false
panel.backgroundColor = .clear
panel.hasShadow = true
panel.animationBehavior = .none
panel.becomesKeyOnlyIfNeeded = false
panel.hidesOnDeactivate = false
panel.worksWhenModal = true
panel.isReleasedWhenClosed = false

panel.titleVisibility = .hidden
panel.titlebarAppearsTransparent = true
panel.isMovableByWindowBackground = false
panel.acceptsMouseMovedEvents = true
panel.appearance = NSAppearance(named: windowState.theme.isDark ? .darkAqua : .aqua)

let toolbar = NSToolbar(identifier: "ChatToolbar")
toolbar.allowsUserCustomization = false
toolbar.autosavesConfiguration = false

let toolbarDelegate = ChatToolbarDelegate(windowState: windowState, session: windowState.session)
toolbar.delegate = toolbarDelegate
panel.chatToolbarDelegate = toolbarDelegate
panel.toolbar = toolbar
panel.toolbarStyle = .unified

let panel = createChatPanel(windowId: windowId, windowState: windowState)
panel.contentViewController = hostingController
panel.setContentSize(defaultSize)

if windows.count == 1 {
panel.setFrameAutosaveName(WindowFrameAutosaveKey.chat.rawValue)
}

let delegate = ChatWindowDelegate(windowId: windowId, manager: self)
windowDelegates[windowId] = delegate
panel.delegate = delegate

applyWindowFramePersistence(panel: panel)

return panel
}
Expand All @@ -469,40 +402,47 @@ public final class ChatWindowManager: NSObject, ObservableObject {

let hostingController = NSHostingController(rootView: chatView)

let panel = createChatPanel(windowId: windowId, windowState: windowState)
panel.contentViewController = hostingController

applyWindowFramePersistence(panel: panel)

return panel
}

/// Shared logic for creating the basic ChatPanel with its toolbar and delegate.
private func createChatPanel(windowId: UUID, windowState: ChatWindowState) -> ChatPanel {
// Calculate centered position on active screen, with offset for multiple windows
let defaultSize = NSSize(width: 800, height: 610)
let mouse = NSEvent.mouseLocation
let screen = NSScreen.screens.first { NSMouseInRect(mouse, $0.frame, false) } ?? NSScreen.main

// Cascade offset based on number of existing windows (25pt per window)
let cascadeOffset = CGFloat(windows.count) * 25.0
// Use count - 1 so the first window starts at the base position
let cascadeOffset = CGFloat(max(0, windows.count - 1)) * 25.0

let initialRect: NSRect
if let s = screen {
let vf = s.visibleFrame
// Start from center, then offset down-right for each additional window
let baseOrigin = NSPoint(
x: vf.midX - defaultSize.width / 2,
y: vf.midY - defaultSize.height / 2
)
// Apply cascade: move right and down
var origin = NSPoint(
x: baseOrigin.x + cascadeOffset,
y: baseOrigin.y - cascadeOffset
)
// Ensure window stays within visible frame
if origin.x + defaultSize.width > vf.maxX {
origin.x = vf.minX + 50 // Wrap back to left
origin.x = vf.minX + 50
}
if origin.y < vf.minY {
origin.y = vf.maxY - defaultSize.height - 50 // Wrap back to top
origin.y = vf.maxY - defaultSize.height - 50
}
initialRect = NSRect(origin: origin, size: defaultSize)
} else {
initialRect = NSRect(origin: .zero, size: defaultSize)
}

// Create panel (like original chat window)
let panel = ChatPanel(
contentRect: initialRect,
styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
Expand Down Expand Up @@ -535,23 +475,52 @@ public final class ChatWindowManager: NSObject, ObservableObject {
panel.toolbar = toolbar
panel.toolbarStyle = .unified

panel.contentViewController = hostingController

// Set size directly - let SwiftUI layout asynchronously for faster window appearance
panel.setContentSize(defaultSize)

if windows.count == 1 {
panel.setFrameAutosaveName(WindowFrameAutosaveKey.chat.rawValue)
}

// Set up delegate for lifecycle events
let delegate = ChatWindowDelegate(windowId: windowId, manager: self)
windowDelegates[windowId] = delegate
panel.delegate = delegate

return panel
}

/// Common method for window frame persistence and cascading.
private func applyWindowFramePersistence(panel: NSPanel) {
let mouse = NSEvent.mouseLocation
let screen = NSScreen.screens.first { NSMouseInRect(mouse, $0.frame, false) } ?? NSScreen.main
let cascadeOffset = CGFloat(max(0, windows.count - 1)) * 25.0

// Try to load saved frame for ALL windows to get the user's preferred size
_ = panel.setFrameUsingName(WindowFrameAutosaveKey.chat.rawValue)

if windows.count > 1 {
// Recalculate origin for subsequent windows in case the size changed from default
let currentSize = panel.frame.size
if let s = screen {
let vf = s.visibleFrame
let baseOrigin = NSPoint(
x: vf.midX - currentSize.width / 2,
y: vf.midY - currentSize.height / 2
)
var origin = NSPoint(
x: baseOrigin.x + cascadeOffset,
y: baseOrigin.y - cascadeOffset
)
if origin.x + currentSize.width > vf.maxX {
origin.x = vf.minX + 50
}
if origin.y < vf.minY {
origin.y = vf.maxY - currentSize.height - 50
}
panel.setFrameOrigin(origin)
}
}

// Only the first window will save its changes back to the slot
if windows.count == 1 {
panel.setFrameAutosaveName(WindowFrameAutosaveKey.chat.rawValue)
}
}

// Called by delegate when window becomes key
fileprivate func windowDidBecomeKey(id: UUID) {
lastFocusedWindowId = id
Expand Down
Loading