mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-14 11:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: fix tab title editor frame update during winding resizing (#12220)

Browse Source 
https://github.com/user-attachments/assets/69bee4f9-e3e1-4dc7-8e9c-c395572d2dbf
This commit is contained in:
Mitchell Hashimoto
2026-04-10 06:17:35 -07:00
committed by GitHub
parent 1348e04626 41c872c1f4
commit d51e94f7eb
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,10 +158,8 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
// Build the editor using title text and style derived from the tab's existing label.
let editedTitle = delegate?.tabTitleEditor(self, titleFor: targetWindow) ?? targetWindow.title
let sourceLabel = sourceTabTitleLabel(from: tabState.labels.map(\.label), matching: editedTitle)
let editorFrame = tabTitleEditorFrame(for: tabButton, sourceLabel: sourceLabel)
guard editorFrame.width >= 20, editorFrame.height >= 14 else { return false }
let editor = NSTextField(frame: editorFrame)
let editor = NSTextField(frame: .zero)
editor.delegate = self
editor.stringValue = editedTitle
editor.alignment = sourceLabel?.alignment ?? .center
@@ -193,6 +191,15 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
tabButton.layoutSubtreeIfNeeded()
tabButton.displayIfNeeded()
tabButton.addSubview(editor)
editor.translatesAutoresizingMaskIntoConstraints = false
let horizontalInset: CGFloat = 6
let editorHeight = sourceLabel?.bounds.height ?? tabButton.bounds.height
NSLayoutConstraint.activate([
editor.centerYAnchor.constraint(equalTo: tabButton.centerYAnchor),
editor.leadingAnchor.constraint(equalTo: tabButton.leadingAnchor, constant: horizontalInset),
editor.trailingAnchor.constraint(equalTo: tabButton.trailingAnchor, constant: -horizontalInset),
editor.heightAnchor.constraint(equalToConstant: editorHeight),
])
CATransaction.commit()
// Focus after insertion so AppKit has created the field editor for this text field.
@@ -256,23 +263,6 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
delegate?.tabTitleEditor(self, didFinishEditing: targetWindow)
}
/// Chooses an editor frame that aligns with the tab title within the tab button.
private func tabTitleEditorFrame(for tabButton: NSView, sourceLabel: NSTextField?) -> NSRect {
let bounds = tabButton.bounds
let horizontalInset: CGFloat = 6
var frame = bounds.insetBy(dx: horizontalInset, dy: 0)
if let sourceLabel {
let labelFrame = tabButton.convert(sourceLabel.bounds, from: sourceLabel)
/// The `labelFrame.minY` value changes unexpectedly after double clicking selected text,
/// I don't know exactly why, but `tabButton.bounds` appears stable enough to calculate the correct position reliably.
frame.origin.y = bounds.midY - labelFrame.height * 0.5
frame.size.height = labelFrame.height
}
return frame.integral
}
/// Selects the best title label candidate from private tab button subviews.
private func sourceTabTitleLabel(from labels: [NSTextField], matching title: String) -> NSTextField? {
let expected = title.trimmingCharacters(in: .whitespacesAndNewlines)