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

Fix update pill constraint feedback loop

Browse source 
The pill never appeared because:
1. SwiftUI .frame(width:0, height:0) when idle poisoned fittingSize
2. AppKit constraints locked at 0x0 prevented expansion on state change
3. fittingSize always returned 0 due to active 0x0 constraints

Fix: Remove zero-frame from SwiftUI (always render at natural size,
use opacity only). Deactivate constraints before measuring fittingSize
so they don't clamp the measurement. Pass visibility to sizeToolbarItem
to set constraints to zero when idle or natural size when active.
This commit is contained in:
Lawrence Chen 2026-02-08 20:21:27 -08:00
parent e03fc1909b
commit 679cafdc51
5 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Sources/WindowToolbarController.swift
View file

@ -128,16 +128,17 @@ final class WindowToolbarController: NSObject, NSToolbarDelegate {
let view = NonDraggableHostingView(rootView: UpdatePill(model: updateViewModel))
let key = ObjectIdentifier(toolbar)
item.view = view
sizeToolbarItem(for: key, hostingView: view)
let visible = !updateViewModel.effectiveState.isIdle
sizeToolbarItem(for: key, hostingView: view, visible: visible)
updateSizeCancellables[key]?.cancel()
updateSizeCancellables[key] = updateViewModel.$state
.receive(on: DispatchQueue.main)
.sink { [weak self, weak view] _ in
.sink { [weak self, weak view] newState in
// @Published fires on willSet, so SwiftUI hasn't processed the
// new state yet. Defer measurement to the next run loop cycle.
DispatchQueue.main.async { [weak self, weak view] in
guard let self, let view else { return }
self.sizeToolbarItem(for: key, hostingView: view)
self.sizeToolbarItem(for: key, hostingView: view, visible: !newState.isIdle)
}
}
return item
@ -146,10 +147,19 @@ final class WindowToolbarController: NSObject, NSToolbarDelegate {
return nil
}
private func sizeToolbarItem(for key: ObjectIdentifier, hostingView: NSView) {
private func sizeToolbarItem(for key: ObjectIdentifier, hostingView: NSView, visible: Bool) {
// Deactivate existing constraints before measuring so they don't
// clamp fittingSize to zero (chicken-and-egg sizing problem).
if let constraints = updateViewConstraints[key] {
constraints.width.isActive = false
constraints.height.isActive = false
}
hostingView.invalidateIntrinsicContentSize()
hostingView.layoutSubtreeIfNeeded()
let size = hostingView.fittingSize
let naturalSize = hostingView.fittingSize
let size = visible ? naturalSize : .zero
hostingView.setFrameSize(size)
hostingView.setContentHuggingPriority(.required, for: .horizontal)
hostingView.setContentHuggingPriority(.required, for: .vertical)
@ -157,6 +167,8 @@ final class WindowToolbarController: NSObject, NSToolbarDelegate {
if let constraints = updateViewConstraints[key] {
constraints.width.constant = size.width
constraints.height.constant = size.height
constraints.width.isActive = true
constraints.height.isActive = true
} else {
let width = hostingView.widthAnchor.constraint(equalToConstant: size.width)
let height = hostingView.heightAnchor.constraint(equalToConstant: size.height)