marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tab drag blank state and preserve non-custom titles across window drops

Browse source
This commit is contained in:
Lawrence Chen 2026-02-23 23:57:09 -08:00
parent fb1802a54d
commit cd03073240
6 changed files with 234 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

77
Sources/GhosttyTerminalView.swift
View file

@ -4104,9 +4104,11 @@ final class GhosttySurfaceScrollView: NSView {
isHidden = !visible
#if DEBUG
if wasVisible != visible {
let transition = "\(wasVisible ? 1 : 0)->\(visible ? 1 : 0)"
let suffix = debugVisibilityStateSuffix(transition: transition)
debugLogWorkspaceSwitchTiming(
event: "ws.term.visible",
suffix: "surface=\(surfaceView.terminalSurface?.id.uuidString.prefix(5) ?? "nil") value=\(visible ? 1 : 0)"
suffix: suffix
)
}
#endif
@ -4126,9 +4128,11 @@ final class GhosttySurfaceScrollView: NSView {
isActive = active
#if DEBUG
if wasActive != active {
let transition = "\(wasActive ? 1 : 0)->\(active ? 1 : 0)"
let suffix = debugVisibilityStateSuffix(transition: transition)
debugLogWorkspaceSwitchTiming(
event: "ws.term.active",
suffix: "surface=\(surfaceView.terminalSurface?.id.uuidString.prefix(5) ?? "nil") value=\(active ? 1 : 0)"
suffix: suffix
)
}
#endif
@ -4150,6 +4154,37 @@ final class GhosttySurfaceScrollView: NSView {
let dtMs = (CACurrentMediaTime() - snapshot.startedAt) * 1000
dlog("\(event) id=\(snapshot.id) dt=\(String(format: "%.2fms", dtMs)) \(suffix)")
}
private func debugFirstResponderLabel() -> String {
guard let window, let firstResponder = window.firstResponder else { return "nil" }
if let view = firstResponder as? NSView {
if view === surfaceView {
return "surfaceView"
}
if view.isDescendant(of: surfaceView) {
return "surfaceDescendant"
}
return String(describing: type(of: view))
}
return String(describing: type(of: firstResponder))
}
private func debugVisibilityStateSuffix(transition: String) -> String {
let surface = surfaceView.terminalSurface?.id.uuidString.prefix(5) ?? "nil"
let hiddenInHierarchy = (isHiddenOrHasHiddenAncestor || surfaceView.isHiddenOrHasHiddenAncestor) ? 1 : 0
let inWindow = window != nil ? 1 : 0
let hasSuperview = superview != nil ? 1 : 0
let hostHidden = isHidden ? 1 : 0
let surfaceHidden = surfaceView.isHidden ? 1 : 0
let boundsText = String(format: "%.1fx%.1f", bounds.width, bounds.height)
let frameText = String(format: "%.1fx%.1f", frame.width, frame.height)
let responder = debugFirstResponderLabel()
return
"surface=\(surface) transition=\(transition) active=\(isActive ? 1 : 0) " +
"visibleFlag=\(surfaceView.isVisibleInUI ? 1 : 0) hostHidden=\(hostHidden) surfaceHidden=\(surfaceHidden) " +
"hiddenHierarchy=\(hiddenInHierarchy) inWindow=\(inWindow) hasSuperview=\(hasSuperview) " +
"bounds=\(boundsText) frame=\(frameText) firstResponder=\(responder)"
}
#endif
func moveFocus(from previous: GhosttySurfaceScrollView? = nil, delay: TimeInterval? = nil) {
@ -5001,32 +5036,36 @@ struct GhosttyTerminalView: NSViewRepresentable {
func updateNSView(_ nsView: NSView, context: Context) {
let hostedView = terminalSurface.hostedView
let coordinator = context.coordinator
#if DEBUG
let previousDesiredIsActive = coordinator.desiredIsActive
#endif
let previousDesiredIsVisibleInUI = coordinator.desiredIsVisibleInUI
let previousDesiredShowsUnreadNotificationRing = coordinator.desiredShowsUnreadNotificationRing
let previousDesiredPortalZPriority = coordinator.desiredPortalZPriority
let desiredStateChanged =
previousDesiredIsActive != isActive ||
previousDesiredIsVisibleInUI != isVisibleInUI ||
previousDesiredPortalZPriority != portalZPriority
coordinator.desiredIsActive = isActive
coordinator.desiredIsVisibleInUI = isVisibleInUI
coordinator.desiredShowsUnreadNotificationRing = showsUnreadNotificationRing
coordinator.desiredPortalZPriority = portalZPriority
coordinator.hostedView = hostedView
#if DEBUG
if previousDesiredIsActive != isActive ||
previousDesiredIsVisibleInUI != isVisibleInUI ||
previousDesiredPortalZPriority != portalZPriority {
if desiredStateChanged {
if let snapshot = AppDelegate.shared?.tabManager?.debugCurrentWorkspaceSwitchSnapshot() {
let dtMs = (CACurrentMediaTime() - snapshot.startedAt) * 1000
dlog(
"ws.swiftui.update id=\(snapshot.id) dt=\(String(format: "%.2fms", dtMs)) " +
"surface=\(terminalSurface.id.uuidString.prefix(5)) visible=\(isVisibleInUI ? 1 : 0) " +
"active=\(isActive ? 1 : 0) z=\(portalZPriority)"
"active=\(isActive ? 1 : 0) z=\(portalZPriority) " +
"hostWindow=\(nsView.window != nil ? 1 : 0) hostedWindow=\(hostedView.window != nil ? 1 : 0) " +
"hostedSuperview=\(hostedView.superview != nil ? 1 : 0)"
)
} else {
dlog(
"ws.swiftui.update id=none surface=\(terminalSurface.id.uuidString.prefix(5)) " +
"visible=\(isVisibleInUI ? 1 : 0) active=\(isActive ? 1 : 0) z=\(portalZPriority)"
"visible=\(isVisibleInUI ? 1 : 0) active=\(isActive ? 1 : 0) z=\(portalZPriority) " +
"hostWindow=\(nsView.window != nil ? 1 : 0) hostedWindow=\(hostedView.window != nil ? 1 : 0) " +
"hostedSuperview=\(hostedView.superview != nil ? 1 : 0)"
)
}
}
@ -5114,6 +5153,16 @@ struct GhosttyTerminalView: NSViewRepresentable {
// Bind is deferred until host moves into a window. Update the
// existing portal entry's visibleInUI now so that any portal sync
// that runs before the deferred bind completes won't hide the view.
#if DEBUG
if desiredStateChanged {
dlog(
"ws.hostState.deferBind surface=\(terminalSurface.id.uuidString.prefix(5)) " +
"reason=hostNoWindow visible=\(coordinator.desiredIsVisibleInUI ? 1 : 0) " +
"active=\(coordinator.desiredIsActive ? 1 : 0) z=\(coordinator.desiredPortalZPriority) " +
"hostedWindow=\(hostedView.window != nil ? 1 : 0) hostedSuperview=\(hostedView.superview != nil ? 1 : 0)"
)
}
#endif
TerminalWindowPortalRegistry.updateEntryVisibility(
for: hostedView,
visibleInUI: coordinator.desiredIsVisibleInUI
@ -5137,6 +5186,16 @@ struct GhosttyTerminalView: NSViewRepresentable {
} else {
// Preserve portal entry visibility while a stale host is still receiving SwiftUI updates.
// The currently bound host remains authoritative for immediate visible/active state.
#if DEBUG
if desiredStateChanged {
dlog(
"ws.hostState.deferApply surface=\(terminalSurface.id.uuidString.prefix(5)) " +
"reason=staleHostBinding hostWindow=\(hostWindowAttached ? 1 : 0) " +
"boundToCurrent=\(isBoundToCurrentHost ? 1 : 0) hostedSuperview=\(hostedView.superview != nil ? 1 : 0) " +
"visible=\(isVisibleInUI ? 1 : 0) active=\(isActive ? 1 : 0)"
)
}
#endif
TerminalWindowPortalRegistry.updateEntryVisibility(
for: hostedView,
visibleInUI: isVisibleInUI