Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-17 09:16:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #312 from mitchellh/mrn/fix-cascade-point

Browse Source 
macOS: fix cascading windows when using tabs and closing windows
This commit is contained in:
Mitchell Hashimoto
2023-08-19 11:43:32 -07:00
committed by GitHub
parent f6a8c83325 be114e792f
commit 1a49fbe2be
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
macos/Sources/Features/Primary Window/PrimaryWindowManager.swift
View File

@ -137,16 +137,20 @@ class PrimaryWindowManager {
} }
private func addNewTab(to window: NSWindow, withBaseConfig config: ghostty_surface_config_s? = nil) { private func addNewTab(to window: NSWindow, withBaseConfig config: ghostty_surface_config_s? = nil) {
guard let controller = createWindowController(withBaseConfig: config) else { return } guard let controller = createWindowController(withBaseConfig: config, cascade: false) else { return }
guard let newWindow = addManagedWindow(windowController: controller)?.window else { return } guard let newWindow = addManagedWindow(windowController: controller)?.window else { return }
window.addTabbedWindow(newWindow, ordered: .above) window.addTabbedWindow(newWindow, ordered: .above)
newWindow.makeKeyAndOrderFront(nil) newWindow.makeKeyAndOrderFront(nil)
} }
private func createWindowController(withBaseConfig config: ghostty_surface_config_s? = nil) -> PrimaryWindowController? { private func createWindowController(withBaseConfig config: ghostty_surface_config_s? = nil, cascade: Bool = true) -> PrimaryWindowController? {
guard let appDelegate = NSApplication.shared.delegate as? AppDelegate else { return nil } guard let appDelegate = NSApplication.shared.delegate as? AppDelegate else { return nil }
let window = PrimaryWindow.create(ghostty: ghostty, appDelegate: appDelegate, baseConfig: config) let window = PrimaryWindow.create(ghostty: ghostty, appDelegate: appDelegate, baseConfig: config)
if (cascade) {
Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint) Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint)
}
let controller = PrimaryWindowController(window: window) let controller = PrimaryWindowController(window: window)
controller.windowManager = self controller.windowManager = self
return controller return controller
@ -169,5 +173,12 @@ class PrimaryWindowManager {
private func removeWindow(window: NSWindow) { private func removeWindow(window: NSWindow) {
self.managedWindows.removeAll(where: { $0.window === window }) self.managedWindows.removeAll(where: { $0.window === window })
// If we remove a window, we reset the cascade point to the key window so that
// the next window cascade's from that one.
if let focusedWindow = NSApplication.shared.keyWindow {
let frame = focusedWindow.frame
Self.lastCascadePoint = NSPoint(x: frame.minX, y: frame.maxY)
}
} }
} }