mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "macos: add support for middle-click tab close for macos-titlebar-style = tabs (#11963)"

Browse Source 
This reverts commit 5540f5f249, reversing
changes made to cca4c788ad.
This commit is contained in:
Lukas
2026-03-30 12:08:49 +02:00
parent 5540f5f249
commit 5c5029b0c4
3 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
View File

@@ -840,29 +840,3 @@ extension TerminalWindow: TabTitleEditorDelegate {
makeFirstResponder(focusedSurface)
}
}
// MARK: - Tab Clicks
extension TerminalWindow {
/// Handles a middle-click event to close the tab under the cursor
///
/// Returns true if the event was handled and should be consumed
func handleTabBarMiddleClick(_ event: NSEvent) -> Bool {
// Require middle click
guard event.type == .otherMouseDown && event.buttonNumber == 2 else { return false }
// Require tab hit
let screenPoint = convertPoint(toScreen: event.locationInWindow)
guard let hit = tabButtonHit(atScreenPoint: screenPoint) else { return false }
// Require we have tabs and the index is valid
guard let tabbedWindows = tabbedWindows,
hit.index < tabbedWindows.count else { return false }
// Find the controller and close it
let targetWindow = tabbedWindows[hit.index]
guard let controller = targetWindow.windowController as? TerminalController else { return false }
controller.closeTab(nil)
return true
}
}

3
macos/Sources/Features/Terminal/Window Styles/TitlebarTabsTahoeTerminalWindow.swift
View File

@@ -76,9 +76,6 @@ class TitlebarTabsTahoeTerminalWindow: TransparentTitlebarTerminalWindow, NSTool
return
}
// Handle middle-click to close tabs if configured
if handleTabBarMiddleClick(event) { return }
let isRightClick =
event.type == .rightMouseDown ||
(event.type == .otherMouseDown && event.buttonNumber == 2) ||

5
macos/Sources/Features/Terminal/Window Styles/TitlebarTabsVenturaTerminalWindow.swift
View File

@@ -69,11 +69,6 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
tab.attributedTitle = attributedTitle
}
override func sendEvent(_ event: NSEvent) {
if tabBarView != nil && handleTabBarMiddleClick(event) { return }
super.sendEvent(event)
}
override func layoutIfNeeded() {
super.layoutIfNeeded()