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

Merge pull request #1015 from mitchellh/macos-tab-order

Browse Source 
macos: new tab button creates new tab after short delay
This commit is contained in:
Mitchell Hashimoto
2023-12-07 12:42:15 -08:00
committed by GitHub
parent 5057b1bf76 fc6def01a1
commit 6c285e1a3d
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
macos/Sources/Features/Terminal/TerminalController.swift
View File

@ -99,7 +99,7 @@ class TerminalController: NSWindowController, NSWindowDelegate,
guard let windows = self.window?.tabbedWindows else { return } guard let windows = self.window?.tabbedWindows else { return }
guard let cfg = ghostty.config else { return } guard let cfg = ghostty.config else { return }
// We only listen for frame changes if we have more than 1 window, // We only listen for frame changes if we have more than 1 window,
// otherwise the accessory view doesn't matter. // otherwise the accessory view doesn't matter.
tabListenForFrame = windows.count > 1 tabListenForFrame = windows.count > 1
@ -189,7 +189,21 @@ class TerminalController: NSWindowController, NSWindowDelegate,
override func newWindowForTab(_ sender: Any?) { override func newWindowForTab(_ sender: Any?) {
// Trigger the ghostty core event logic for a new tab. // Trigger the ghostty core event logic for a new tab.
guard let surface = self.focusedSurface?.surface else { return } guard let surface = self.focusedSurface?.surface else { return }
ghostty.newTab(surface: surface)
// This is necessary due to a really strange issue on macOS that I was never
// able to figure out: if we create a new tab in this function directly, then
// it is incorrectly added to the wrong index in `tabGroup.windows`. The macOS
// `tabGroup.windows` documentation says that will always be in visual order
// of the tab but I was finding that not to be true. By introducing a small delay,
// I noticed everything works. I can't explain it and I'd rather not do this so
// if someone can figure this out that'd be great.
//
// See: https://github.com/mitchellh/ghostty/issues/1010
// Last reproduced on macOS 14.1
DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) { [weak self] in
guard let s = self else { return }
s.ghostty.newTab(surface: surface)
}
} }
//MARK: - NSWindowDelegate //MARK: - NSWindowDelegate