Skip to content

Fix minimal UI terminal top-row hit testing #6073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
austinywang merged 15 commits into from
Jun 14, 2026
+300 −39
Merged

Fix minimal UI terminal top-row hit testing #6073

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2685f38
test: cover minimal terminal titlebar hit testing
austinywang Jun 14, 2026
eaa049e
fix: keep minimal terminal top row clickable
austinywang Jun 14, 2026
45049b3
Merge remote-tracking branch 'origin/main' into issue-6066-minimal-ui…
austinywang Jun 14, 2026
4a0cbc1
test: move titlebar hit test out of large suite
austinywang Jun 14, 2026
31df166
fix: preserve titlebar control hit testing
austinywang Jun 14, 2026
b6198ed
test: guard titlebar band preconditions
austinywang Jun 14, 2026
7a74b84
test: use Swift Testing for titlebar hit tests
austinywang Jun 14, 2026
293b605
fix: defer titlebar double-clicks over terminal
austinywang Jun 14, 2026
cedb2fa
perf: reuse terminal hit in titlebar routing
austinywang Jun 14, 2026
44e1711
chore: normalize project file
austinywang Jun 14, 2026
2fa0b9f
fix: defer app titlebar double-clicks over terminal
austinywang Jun 14, 2026
227c6dc
fix: bound terminal titlebar hit lookup
austinywang Jun 14, 2026
2b98ced
fix: align chrome titlebar terminal routing
austinywang Jun 14, 2026
891801b
Merge origin/main into issue-6066-minimal-ui-toolbar-hittest
austinywang Jun 14, 2026
0288a7f
perf: lazily resolve terminal titlebar hits
austinywang Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Sources/TerminalWindowPortal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ final class WindowTerminalHostView: NSView {
let eventType = routingContext.eventType

if routingContext.allowsPortalPointerHitTesting {
if shouldPassThroughToTitlebar(at: point) {
if shouldPassThroughToTitlebar(at: point),
hostedTerminalHitView(at: point) == nil {
clearActiveDividerCursor(restoreArrow: false)
return nil
}
Expand Down
39 changes: 39 additions & 0 deletions cmuxTests/TerminalAndGhosttyTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3802,6 +3802,45 @@ final class WindowTerminalHostViewTests: XCTestCase {
)
}

func testHostViewKeepsTerminalTopRowClickableInsideTitlebarBand() {
let window = NSWindow(
contentRect: NSRect(x: 0, y: 0, width: 420, height: 260),
styleMask: [.titled, .closable],
backing: .buffered,
defer: false
)
defer { window.orderOut(nil) }
guard let contentView = window.contentView,
let container = contentView.superview else {
XCTFail("Expected window content container")
return
}

let hostFrame = container.convert(contentView.bounds, from: contentView)
let host = WindowTerminalHostView(frame: hostFrame)
host.autoresizingMask = [.width, .height]

let hostedView = makeHostedTerminalView(frame: host.bounds)
host.addSubview(hostedView)
container.addSubview(host, positioned: .above, relativeTo: contentView)

let pointInHostedView = NSPoint(x: hostedView.bounds.midX, y: hostedView.bounds.maxY - 0.5)
let pointInWindow = hostedView.convert(pointInHostedView, to: nil)
let pointInHost = host.convert(pointInWindow, from: nil)
let event = makeMouseDownEvent(at: pointInWindow, window: window)

XCTAssertGreaterThanOrEqual(
pointInWindow.y,
BonsplitTabBarPassThrough.titlebarInteractionBandMinY(in: window),
"The regression point must exercise the fixed-height titlebar pass-through band"
)
assertHitFallsInsideHostedTerminal(
host.performHitTest(at: pointInHost, currentEvent: event),
hostedView: hostedView,
message: "Minimal-mode terminal content that extends into the titlebar band should keep receiving top-row mouse-downs"
)

@greptile-apps greptile-apps Bot Jun 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Guard assertion does not exit on failure

XCTAssertGreaterThanOrEqual records a failure but does not stop execution. If the window geometry unexpectedly places pointInWindow.y below titlebarInteractionBandMinY, the guard assertion fires but assertHitFallsInsideHostedTerminal is still evaluated. Because the hosted terminal fills the entire host.bounds, a click anywhere on it would route to the terminal even without the fix — so the second assertion would likely pass on the old code as well, making the regression test give a false sense of coverage while only the guard shows as failing. Adding a return (or using XCTSkipIf) after the guard assertion ensures the test aborts rather than silently exercising the wrong scenario.

Suggested change
XCTAssertGreaterThanOrEqual(
pointInWindow.y,
BonsplitTabBarPassThrough.titlebarInteractionBandMinY(in: window),
"The regression point must exercise the fixed-height titlebar pass-through band"
)
assertHitFallsInsideHostedTerminal(
host.performHitTest(at: pointInHost, currentEvent: event),
hostedView: hostedView,
message: "Minimal-mode terminal content that extends into the titlebar band should keep receiving top-row mouse-downs"
)
guard pointInWindow.y >= BonsplitTabBarPassThrough.titlebarInteractionBandMinY(in: window) else {
XCTFail("The regression point must exercise the fixed-height titlebar pass-through band")
return
}
assertHitFallsInsideHostedTerminal(

@austinywang austinywang Jun 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in b6198ed by converting the titlebar-band preconditions to guard/return checks in the new focused test file, so the assertions cannot continue on the wrong geometry.

— Claude Code

@austinywang austinywang Jun 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Superseded in the current test file: the titlebar-band geometry check now uses Swift Testing , so the test exits before evaluating the hit assertion if the point is outside the fixed band.

— Claude Code

}

func testHostViewPassesThroughWhenNoTerminalSubviewIsHit() {
let host = WindowTerminalHostView(frame: NSRect(x: 0, y: 0, width: 200, height: 120))

Expand Down
Loading