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

avoid command palette overlay subview scans on each update

Browse source
This commit is contained in:
Lawrence Chen 2026-02-25 15:49:25 -08:00
parent f51848f666
commit 7b7745caa0
2 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Sources/ContentView.swift
View file

@ -781,6 +781,12 @@ var fileDropOverlayKey: UInt8 = 0
private var commandPaletteWindowOverlayKey: UInt8 = 0
let commandPaletteOverlayContainerIdentifier = NSUserInterfaceItemIdentifier("cmux.commandPalette.overlay.container")
enum CommandPaletteOverlayPromotionPolicy {
static func shouldPromote(previouslyVisible: Bool, isVisible: Bool) -> Bool {
isVisible && !previouslyVisible
}
}
@MainActor
private final class CommandPaletteOverlayContainerView: NSView {
var capturesMouseEvents = false
@ -850,13 +856,17 @@ private final class WindowCommandPaletteOverlayController: NSObject {
]
NSLayoutConstraint.activate(installConstraints)
installedThemeFrame = themeFrame
} else if themeFrame.subviews.last !== containerView {
themeFrame.addSubview(containerView, positioned: .above, relativeTo: nil)
}
return true
}
private func promoteOverlayAboveSiblingsIfNeeded() {
guard let themeFrame = installedThemeFrame,
containerView.superview === themeFrame else { return }
themeFrame.addSubview(containerView, positioned: .above, relativeTo: nil)
}
private func isPaletteResponder(_ responder: NSResponder?) -> Bool {
guard let responder else { return false }
@ -1052,14 +1062,18 @@ private final class WindowCommandPaletteOverlayController: NSObject {
func update(rootView: AnyView, isVisible: Bool) {
guard ensureInstalled() else { return }
let shouldPromote = CommandPaletteOverlayPromotionPolicy.shouldPromote(
previouslyVisible: isPaletteVisible,
isVisible: isVisible
)
isPaletteVisible = isVisible
if isVisible {
hostingView.rootView = rootView
containerView.capturesMouseEvents = true
containerView.isHidden = false
containerView.alphaValue = 1
if let themeFrame = installedThemeFrame, themeFrame.subviews.last !== containerView {
themeFrame.addSubview(containerView, positioned: .above, relativeTo: nil)
if shouldPromote {
promoteOverlayAboveSiblingsIfNeeded()
}
updateFocusLockForWindowState()
} else {

36
cmuxTests/CmuxWebViewKeyEquivalentTests.swift
View file

@ -6222,6 +6222,42 @@ final class WindowMoveSuppressionHitPathTests: XCTestCase {
}
}
@MainActor
final class CommandPaletteOverlayPromotionPolicyTests: XCTestCase {
func testShouldPromoteWhenBecomingVisible() {
XCTAssertTrue(
CommandPaletteOverlayPromotionPolicy.shouldPromote(
previouslyVisible: false,
isVisible: true
)
)
}
func testShouldNotPromoteWhenAlreadyVisible() {
XCTAssertFalse(
CommandPaletteOverlayPromotionPolicy.shouldPromote(
previouslyVisible: true,
isVisible: true
)
)
}
func testShouldNotPromoteWhenHidden() {
XCTAssertFalse(
CommandPaletteOverlayPromotionPolicy.shouldPromote(
previouslyVisible: true,
isVisible: false
)
)
XCTAssertFalse(
CommandPaletteOverlayPromotionPolicy.shouldPromote(
previouslyVisible: false,
isVisible: false
)
)
}
}
@MainActor
final class GhosttySurfaceOverlayTests: XCTestCase {
func testInactiveOverlayVisibilityTracksRequestedState() {