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

Fix #2210: coalesce portal sync to latest geometry (#2214)

Browse source
This commit is contained in:
Austin Wang 2026-03-29 17:55:40 -07:00 • committed by GitHub
parent 45090d23df
commit d95158e69d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Sources/TerminalWindowPortal.swift
View file

@ -588,6 +588,7 @@ final class WindowTerminalPortal: NSObject {
private var installConstraints: [NSLayoutConstraint] = []
private var hasDeferredFullSyncScheduled = false
private var hasExternalGeometrySyncScheduled = false
private var externalGeometrySyncGeneration: UInt64 = 0
private var geometryObservers: [NSObjectProtocol] = []
#if DEBUG
private var lastLoggedBonsplitContainerSignature: String?
@ -681,6 +682,10 @@ final class WindowTerminalPortal: NSObject {
}
fileprivate func scheduleExternalGeometrySynchronize() {
// Coalesce to the latest request so ancestor/frame churn (for example
// sidebar toggles) doesn't resize the PTY at stale intermediate widths.
externalGeometrySyncGeneration &+= 1
let generation = externalGeometrySyncGeneration
guard !hasExternalGeometrySyncScheduled else { return }
hasExternalGeometrySyncScheduled = true
let isDragEvent = TerminalWindowPortalRegistry.isInteractiveGeometryResizeActive
@ -688,6 +693,11 @@ final class WindowTerminalPortal: NSObject {
DispatchQueue.main.async { [weak self] in
guard let self else { return }
let performSync = {
if self.externalGeometrySyncGeneration != generation {
self.hasExternalGeometrySyncScheduled = false
self.scheduleExternalGeometrySynchronize()
return
}
self.hasExternalGeometrySyncScheduled = false
self.synchronizeAllEntriesFromExternalGeometryChange()
}
@ -1667,6 +1677,7 @@ enum TerminalWindowPortalRegistry {
private static var portalsByWindowId: [ObjectIdentifier: WindowTerminalPortal] = [:]
private static var hostedToWindowId: [ObjectIdentifier: ObjectIdentifier] = [:]
private static var hasPendingExternalGeometrySyncForAllWindows = false
private static var externalGeometrySyncForAllWindowsGeneration: UInt64 = 0
private static var interactiveGeometryResizeCount = 0
#if DEBUG
private static var blockedBindCount: Int = 0
@ -1842,11 +1853,20 @@ enum TerminalWindowPortalRegistry {
}
static func scheduleExternalGeometrySynchronizeForAllWindows() {
// Same latest-request-wins coalescing for callers that don't have a
// concrete window handle yet.
Self.externalGeometrySyncForAllWindowsGeneration &+= 1
let generation = Self.externalGeometrySyncForAllWindowsGeneration
guard !Self.hasPendingExternalGeometrySyncForAllWindows else { return }
Self.hasPendingExternalGeometrySyncForAllWindows = true
let isDragEvent = Self.isInteractiveGeometryResizeActive
DispatchQueue.main.async {
let performSync = {
if Self.externalGeometrySyncForAllWindowsGeneration != generation {
Self.hasPendingExternalGeometrySyncForAllWindows = false
Self.scheduleExternalGeometrySynchronizeForAllWindows()
return
}
Self.hasPendingExternalGeometrySyncForAllWindows = false
for portal in Self.portalsByWindowId.values {
portal.synchronizeAllEntriesFromExternalGeometryChange()