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

macos: passthrough mouse down event to TabTitleEditor if needed

Browse Source
This commit is contained in:
Lukas
2026-03-03 17:00:51 +01:00
parent e6e5f3ffe1
commit 205c05d59d
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ class TerminalWindow: NSWindow {
override var canBecomeMain: Bool { return true }
override func sendEvent(_ event: NSEvent) {
if tabTitleEditor.handleDoubleClick(event) {
if tabTitleEditor.handleMouseDown(event) {
return
}

26
macos/Sources/Helpers/TabTitleEditor.swift
View File

@@ -52,11 +52,10 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
self.delegate = delegate
}
/// Handles double-click events from the host window and begins inline edit if possible. If this
/// returns true then the double click was handled by the coordinator.
func handleDoubleClick(_ event: NSEvent) -> Bool {
// We only want double-clicks
guard event.type == .leftMouseDown, event.clickCount == 2 else { return false }
/// Handles leftMouseDown events from the host window and begins inline edit if possible. If this
/// returns true then the event was handled by the coordinator.
func handleMouseDown(_ event: NSEvent) -> Bool {
guard event.type == .leftMouseDown else { return false }
// If we don't have a host window to look up the click, we do nothing.
guard let hostWindow else { return false }
@@ -68,6 +67,14 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
delegate?.tabTitleEditor(self, canRenameTabFor: targetWindow) == true
else { return false }
guard !isMouseEventWithinEditor(event) else {
// If the click lies within the editor,
// we should forward the event to the editor
inlineTitleEditor?.mouseDown(with: event)
return true
}
// We only want double-clicks to enable editing
guard event.clickCount == 2 else { return false }
// We need to start editing in a separate event loop tick, so set that up.
pendingEditWorkItem?.cancel()
let workItem = DispatchWorkItem { [weak self, weak targetWindow] in
@@ -336,3 +343,12 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
finishEditing(commit: true)
}
}
private extension TabTitleEditor {
func isMouseEventWithinEditor(_ event: NSEvent) -> Bool {
guard let editor = inlineTitleEditor?.currentEditor() else {
return false
}
return editor.convert(editor.bounds, to: nil).contains(event.locationInWindow)
}
}