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 #1982 from injust/fix-relabel-tabs

Browse Source 
Fix tab relabelling when opening >9 tabs
This commit is contained in:
Mitchell Hashimoto
2024-07-21 10:09:57 -07:00
committed by GitHub
parent d656b0650d 5268780f00
commit 76e0cf1046
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,8 @@ class TerminalController: NSWindowController, NSWindowDelegate,
/// Update the accessory view of each tab according to the keyboard /// Update the accessory view of each tab according to the keyboard
/// shortcut that activates it (if any). This is called when the key window /// shortcut that activates it (if any). This is called when the key window
/// changes and when a window is closed. /// changes, when a window is closed, and when tabs are reordered
/// with the mouse.
func relabelTabs() { func relabelTabs() {
// Reset this to false. It'll be set back to true later. // Reset this to false. It'll be set back to true later.
tabListenForFrame = false tabListenForFrame = false
@ -128,12 +129,20 @@ class TerminalController: NSWindowController, NSWindowDelegate,
// 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
for (tab, window) in zip(1..., windows) {
// We need to clear any windows beyond this because they have had
// a keyEquivalent set previously.
guard tab <= 9 else {
window.keyEquivalent = ""
continue
}
for (index, window) in windows.enumerated().prefix(9) { let action = "goto_tab:\(tab)"
let action = "goto_tab:\(index + 1)"
if let equiv = ghostty.config.keyEquivalent(for: action) { if let equiv = ghostty.config.keyEquivalent(for: action) {
window.keyEquivalent = "\(equiv)" window.keyEquivalent = "\(equiv)"
} else {
window.keyEquivalent = ""
} }
} }
} }