From 21e9dd7c95e3f58a19a7c7342ff3d6584eb9097e Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 14 Aug 2026 04:45:56 +0800
Subject: [PATCH] fix: reserve app shelf height for wrapped rows
---
C1.source/Sources/Aligner/QuickSwitchRootView.swift | 1662 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 1,496 insertions(+), 166 deletions(-)
diff --git a/C1.source/Sources/Aligner/QuickSwitchRootView.swift b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
index 552dca0..dd36a57 100644
--- a/C1.source/Sources/Aligner/QuickSwitchRootView.swift
+++ b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
@@ -11,10 +11,24 @@
@MainActor
final class QuickSwitchRootView: NSView {
private static let appShelfIndexSymbols = Array("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ").map(String.init)
+ private static let windowIndexKeyPendingInterval: CFTimeInterval = 0.8
+ private static let appShelfIndexKeyCodes: [String: UInt16] = [
+ "1": 18, "2": 19, "3": 20, "4": 21, "5": 23,
+ "6": 22, "7": 26, "8": 28, "9": 25, "0": 29,
+ "A": 0, "B": 11, "C": 8, "D": 2, "E": 14, "F": 3,
+ "G": 5, "H": 4, "I": 34, "J": 38, "K": 40, "L": 37,
+ "M": 46, "N": 45, "O": 31, "P": 35, "Q": 12, "R": 15,
+ "S": 1, "T": 17, "U": 32, "V": 9, "W": 13, "X": 7,
+ "Y": 16, "Z": 6
+ ]
private let backdropBlurView = NSVisualEffectView()
private let layerHostView = NSView()
private let backgroundLayer = CAGradientLayer()
+ private let darkAmbientLeftLayer = CAGradientLayer()
+ private let darkAmbientCenterLayer = CAGradientLayer()
+ private let darkAmbientRightLayer = CAGradientLayer()
+ private let darkVignetteLayer = CAGradientLayer()
private let safeAreaFillLayer = CALayer()
private let glassLayer = CALayer()
private let laneLayer = CALayer()
@@ -28,6 +42,8 @@
private let closeFeedbackTextLayer = CATextLayer()
private let viewModeToggleButtonLayer = CALayer()
private let viewModeToggleIconLayer = CALayer()
+ private let themeToggleButtonLayer = CALayer()
+ private let themeToggleIconLayer = CALayer()
private let appIconProvider: any AppIconProviderProtocol = WorkspaceAppIconProvider()
private let skeletonThumbnailProvider = NativeSkeletonThumbnailProvider(size: NSSize(width: 160, height: 96))
private var screenshotSourcesByWindowID: [UInt32: ScreenshotResolutionSource] = [:]
@@ -42,6 +58,7 @@
private var appShelfContentWidth: CGFloat = 0
private var appShelfScrollOffset: CGFloat = 0
private var appShelfTrackingArea: NSTrackingArea?
+ private var lastKnownMouseWindowLocation: CGPoint?
private var hoveredAppGroupIndex: Int?
private var hoveredWindowID: UInt32?
private var hoveredSpaceID: UInt64?
@@ -55,6 +72,8 @@
private var closeFeedbackHideTask: Task<Void, Never>?
private var isViewModeToggleButtonHovered = false
private var suppressViewModeToggleHoverPreview = false
+ private var isThemeToggleButtonHovered = false
+ private var suppressThemeToggleHoverPreview = false
private var hoverTarget: HoverTarget = .none
private var hoverTargetSource: HoverTargetSource = .event
private var hoveredSpaceLaneID: UInt64?
@@ -62,6 +81,7 @@
private var debugHoveredAppGroupIndex: Int?
private var waterfallColumns: [WaterfallColumnLayers] = []
private var waterfallViewMode: QuickSwitchWaterfallViewMode = .verticalColumns
+ private var themePreference: ThemePreference = .light
private var waterfallContentWidth: CGFloat = 0
private var waterfallScrollOffset: CGFloat = 0
private var waterfallColumnScrollOffsets: [Int: CGFloat] = [:]
@@ -74,6 +94,14 @@
private var keyboardCommandsApplied: [String] = []
private var lastKeyboardCommand: String?
private var lastKeyboardAppIndexCommand: String?
+ private var appShelfIndexKeyDownCount = 0
+ private var lastAppShelfIndexKeySymbol: String?
+ private var windowIndexKeyPending: WindowIndexKeyPending?
+ private var windowIndexKeyPendingClearTask: Task<Void, Never>?
+ private var lastWindowIndexKeyCommand: String?
+ private var lastWindowIndexKeyCommitCode: String?
+ private var windowShortcutFilterPhase: WindowShortcutFilterPhase = .none
+ private var lastWindowShortcutPreCommitFilterSnapshot: WindowShortcutPreCommitFilterSnapshot?
private var lastBoundaryBounceAxis: String?
private var lastBoundaryBounceDirection: String?
private var boundaryBounceCount = 0
@@ -105,6 +133,7 @@
var onSpaceLaneClick: ((UInt64, Int) -> Void)?
var onBackgroundClick: (() -> Bool)?
var onToggleWaterfallViewMode: (() -> Void)?
+ var onToggleTheme: (() -> Void)?
var onRequestClose: ((QuickSwitchCloseRequest) -> Void)?
var onCloseConfirmationDisabled: (() -> Void)?
@@ -313,6 +342,53 @@
let closeButton: CloseButtonLayers
}
+ private struct WindowIndexKeyPending {
+ let appSymbol: String
+ let appGroupIndex: Int
+ let startedAt: CFTimeInterval
+ }
+
+ private enum WindowShortcutFilterPhase: String {
+ case none
+ case appPending
+ case targetPreCommit
+ case invalid
+ case expired
+ }
+
+ private enum WindowShortcutFilterState: String {
+ case none
+ case matched
+ case dimmed
+ case target
+ }
+
+ private struct WindowShortcutPreCommitFilterSnapshot {
+ let targetCode: String
+ let targetWindowID: UInt32
+ let matchedWindowIDs: [UInt32]
+ let dimmedWindowIDs: [UInt32]
+
+ var reportDictionary: [String: Any] {
+ [
+ "phase": WindowShortcutFilterPhase.targetPreCommit.rawValue,
+ "targetCode": targetCode,
+ "targetWindowID": Int(targetWindowID),
+ "matchedWindowIDs": matchedWindowIDs.map(Int.init),
+ "dimmedWindowIDs": dimmedWindowIDs.map(Int.init)
+ ]
+ }
+ }
+
+ private struct WindowShortcutFilterReport {
+ let active: Bool
+ let phase: WindowShortcutFilterPhase
+ let pendingAppGroupIndex: Int?
+ let prefix: String?
+ let matchedWindowIDs: [UInt32]
+ let dimmedWindowIDs: [UInt32]
+ }
+
private struct ProjectionLayerSnapshot {
let layer: CALayer
let frame: CGRect
@@ -337,10 +413,34 @@
static let normalGap: CGFloat = 16
static let minGap: CGFloat = 8
static let maxRows = 2
+ static let rowHeight: CGFloat = selectedIconSize + 18
+ static let rowGap: CGFloat = 8
+ static let verticalPadding: CGFloat = 6
static let indexFontSize: CGFloat = 16
static let compressedIndexFontSize: CGFloat = 14
static let indexWidth: CGFloat = 18
static let indexHeight: CGFloat = 24
+ static let magneticFirstNeighborInfluence: CGFloat = 0
+ static let magneticSecondNeighborInfluence: CGFloat = 0
+ static let magneticHoverLift: CGFloat = 4
+ static let magneticFirstNeighborLift: CGFloat = 0
+ static let magneticSecondNeighborLift: CGFloat = 0
+ static let magneticAnimationDuration: CFTimeInterval = 0.16
+ static let magneticAnimationTimingName = CAMediaTimingFunctionName.easeOut
+ static let closeButtonHitOutset: CGFloat = 0
+ }
+
+ private struct AppShelfMagneticState {
+ let influence: CGFloat
+ let lift: CGFloat
+
+ var isActive: Bool {
+ influence > 0
+ }
+
+ var isNeighbor: Bool {
+ influence > 0 && influence < 1
+ }
}
private enum RootLayoutMetrics {
@@ -367,6 +467,118 @@
case horizontalSelected = "H2"
case verticalAvailable = "Z1"
case verticalSelected = "Z2"
+ }
+
+ private enum ThemeToggleMetrics {
+ static let buttonGap: CGFloat = 10
+ }
+
+ private enum QuickSwitchResolvedTheme: String {
+ case light
+ case dark
+ }
+
+ private struct QuickSwitchThemePalette {
+ let resolvedTheme: QuickSwitchResolvedTheme
+ let backgroundGradientColors: [NSColor]
+ let safeAreaFill: NSColor
+ let displayGroupBackground: NSColor
+ let spaceLanePrimaryText: NSColor
+ let spaceLaneSecondaryText: NSColor
+ let columnBackground: NSColor
+ let columnBorder: NSColor
+ let columnHeaderBackground: NSColor
+ let columnHeaderHoverBackground: NSColor
+ let columnHeaderSpaceFocusedBackground: NSColor
+ let columnText: NSColor
+ let columnSecondaryText: NSColor
+ let cardBackground: NSColor
+ let cardSelectedBackground: NSColor
+ let cardText: NSColor
+ let cardSecondaryText: NSColor
+ let appShelfLabelText: NSColor
+ let appShelfIndexText: NSColor
+ let appShelfIndexHighlightedText: NSColor
+ let appShelfBackgroundSelected: NSColor
+ let appShelfBackgroundHovered: NSColor
+ let appShelfBackgroundSpaceFocused: NSColor
+ let closeFeedbackBackground: NSColor
+ let closeFeedbackBorder: NSColor
+ let closeFeedbackText: NSColor
+ let shinePeak: NSColor
+
+ static func palette(for theme: QuickSwitchResolvedTheme) -> QuickSwitchThemePalette {
+ switch theme {
+ case .light:
+ return QuickSwitchThemePalette(
+ resolvedTheme: .light,
+ backgroundGradientColors: [
+ NSColor.windowBackgroundColor.withAlphaComponent(0.58),
+ NSColor.controlBackgroundColor.withAlphaComponent(0.48)
+ ],
+ safeAreaFill: .black,
+ displayGroupBackground: NSColor.windowBackgroundColor,
+ spaceLanePrimaryText: .labelColor,
+ spaceLaneSecondaryText: .secondaryLabelColor,
+ columnBackground: NSColor.controlBackgroundColor.withAlphaComponent(0.56),
+ columnBorder: NSColor.separatorColor.withAlphaComponent(0.24),
+ columnHeaderBackground: NSColor.controlBackgroundColor.withAlphaComponent(0.52),
+ columnHeaderHoverBackground: NSColor.systemGray.withAlphaComponent(0.22),
+ columnHeaderSpaceFocusedBackground: NSColor.systemFill.withAlphaComponent(0.10),
+ columnText: .labelColor,
+ columnSecondaryText: .secondaryLabelColor,
+ cardBackground: NSColor.windowBackgroundColor.withAlphaComponent(0.82),
+ cardSelectedBackground: NSColor.windowBackgroundColor.withAlphaComponent(0.94),
+ cardText: .labelColor,
+ cardSecondaryText: .secondaryLabelColor,
+ appShelfLabelText: .secondaryLabelColor,
+ appShelfIndexText: NSColor.labelColor.withAlphaComponent(0.48),
+ appShelfIndexHighlightedText: NSColor.labelColor.withAlphaComponent(0.58),
+ appShelfBackgroundSelected: NSColor.controlAccentColor.withAlphaComponent(0.14),
+ appShelfBackgroundHovered: NSColor.controlAccentColor.withAlphaComponent(0.13),
+ appShelfBackgroundSpaceFocused: NSColor.controlAccentColor.withAlphaComponent(0.14),
+ closeFeedbackBackground: NSColor.windowBackgroundColor.withAlphaComponent(0.94),
+ closeFeedbackBorder: NSColor.separatorColor.withAlphaComponent(0.28),
+ closeFeedbackText: NSColor.secondaryLabelColor.withAlphaComponent(0.96),
+ shinePeak: NSColor.white.withAlphaComponent(0.16)
+ )
+ case .dark:
+ return QuickSwitchThemePalette(
+ resolvedTheme: .dark,
+ backgroundGradientColors: [
+ NSColor(calibratedRed: 5 / 255, green: 8 / 255, blue: 20 / 255, alpha: 1),
+ NSColor(calibratedRed: 15 / 255, green: 24 / 255, blue: 54 / 255, alpha: 1),
+ NSColor(calibratedRed: 3 / 255, green: 42 / 255, blue: 52 / 255, alpha: 1),
+ NSColor(calibratedRed: 2 / 255, green: 6 / 255, blue: 13 / 255, alpha: 1)
+ ],
+ safeAreaFill: .black,
+ displayGroupBackground: NSColor(calibratedRed: 14 / 255, green: 24 / 255, blue: 39 / 255, alpha: 0.72),
+ spaceLanePrimaryText: NSColor.white.withAlphaComponent(0.88),
+ spaceLaneSecondaryText: NSColor.white.withAlphaComponent(0.56),
+ columnBackground: NSColor(calibratedRed: 92 / 255, green: 97 / 255, blue: 111 / 255, alpha: 0.72),
+ columnBorder: NSColor.white.withAlphaComponent(0.20),
+ columnHeaderBackground: NSColor(calibratedRed: 104 / 255, green: 111 / 255, blue: 126 / 255, alpha: 0.70),
+ columnHeaderHoverBackground: NSColor(calibratedRed: 185 / 255, green: 190 / 255, blue: 205 / 255, alpha: 0.32),
+ columnHeaderSpaceFocusedBackground: NSColor(calibratedRed: 92 / 255, green: 171 / 255, blue: 255 / 255, alpha: 0.16),
+ columnText: NSColor.black.withAlphaComponent(0.82),
+ columnSecondaryText: NSColor.black.withAlphaComponent(0.46),
+ cardBackground: NSColor.white.withAlphaComponent(0.90),
+ cardSelectedBackground: NSColor.white.withAlphaComponent(0.96),
+ cardText: NSColor.black.withAlphaComponent(0.86),
+ cardSecondaryText: NSColor.black.withAlphaComponent(0.52),
+ appShelfLabelText: NSColor.white.withAlphaComponent(0.66),
+ appShelfIndexText: NSColor.white.withAlphaComponent(0.40),
+ appShelfIndexHighlightedText: NSColor.white.withAlphaComponent(0.58),
+ appShelfBackgroundSelected: NSColor(calibratedRed: 92 / 255, green: 171 / 255, blue: 255 / 255, alpha: 0.22),
+ appShelfBackgroundHovered: NSColor(calibratedRed: 92 / 255, green: 171 / 255, blue: 255 / 255, alpha: 0.18),
+ appShelfBackgroundSpaceFocused: NSColor(calibratedRed: 92 / 255, green: 171 / 255, blue: 255 / 255, alpha: 0.20),
+ closeFeedbackBackground: NSColor(calibratedRed: 36 / 255, green: 43 / 255, blue: 58 / 255, alpha: 0.96),
+ closeFeedbackBorder: NSColor.white.withAlphaComponent(0.18),
+ closeFeedbackText: NSColor.white.withAlphaComponent(0.76),
+ shinePeak: NSColor.white.withAlphaComponent(0.10)
+ )
+ }
+ }
}
private enum WaterfallMetrics {
@@ -494,6 +706,7 @@
}
override func scrollWheel(with event: NSEvent) {
+ clearWindowIndexKeyPending()
refreshHoverTarget(at: event.locationInWindow)
let dominantDelta = abs(event.scrollingDeltaX) >= abs(event.scrollingDeltaY)
@@ -549,17 +762,28 @@
override func mouseMoved(with event: NSEvent) {
guard debugHoveredAppGroupIndex == nil else { return }
+ lastKnownMouseWindowLocation = event.locationInWindow
+ clearWindowIndexKeyPending()
let toggleHovered = viewModeToggleButtonContains(windowLocation: event.locationInWindow)
+ let themeHovered = themeToggleButtonContains(windowLocation: event.locationInWindow)
if !toggleHovered {
suppressViewModeToggleHoverPreview = false
+ }
+ if !themeHovered {
+ suppressThemeToggleHoverPreview = false
}
let shouldShowToggleHoverPreview = toggleHovered && !suppressViewModeToggleHoverPreview
if isViewModeToggleButtonHovered != shouldShowToggleHoverPreview {
isViewModeToggleButtonHovered = shouldShowToggleHoverPreview
needsLayout = true
}
- if toggleHovered {
+ let shouldShowThemeHoverPreview = themeHovered && !suppressThemeToggleHoverPreview
+ if isThemeToggleButtonHovered != shouldShowThemeHoverPreview {
+ isThemeToggleButtonHovered = shouldShowThemeHoverPreview
+ needsLayout = true
+ }
+ if toggleHovered || themeHovered {
hoveredCloseTarget = nil
setHoverTarget(.none)
return
@@ -575,8 +799,12 @@
override func mouseExited(with event: NSEvent) {
guard debugHoveredAppGroupIndex == nil else { return }
+ lastKnownMouseWindowLocation = nil
+ clearWindowIndexKeyPending()
isViewModeToggleButtonHovered = false
suppressViewModeToggleHoverPreview = false
+ isThemeToggleButtonHovered = false
+ suppressThemeToggleHoverPreview = false
hoveredCloseTarget = nil
setHoverTarget(.none)
}
@@ -591,44 +819,74 @@
return
}
- if handleCloseConfirmationMouseDown(at: event.locationInWindow) {
+ if handleMouseDown(at: event.locationInWindow, clickCount: max(1, event.clickCount), allowBackgroundClick: true) {
return
}
- if viewModeToggleButtonContains(windowLocation: event.locationInWindow) {
+ super.mouseDown(with: event)
+ }
+
+ @discardableResult
+ private func handleMouseDown(at windowLocation: CGPoint, clickCount: Int, allowBackgroundClick: Bool) -> Bool {
+ clearWindowIndexKeyPending()
+
+ if handleCloseConfirmationMouseDown(at: windowLocation) {
+ return true
+ }
+
+ if viewModeToggleButtonContains(windowLocation: windowLocation) {
clickViewModeToggleButton(source: "mouse")
- return
+ return true
}
- if let closeTarget = closeButtonTarget(at: event.locationInWindow) {
+ if themeToggleButtonContains(windowLocation: windowLocation) {
+ clickThemeToggleButton(source: "mouse")
+ return true
+ }
+
+ if let closeTarget = waterfallCloseButtonTarget(at: windowLocation) {
beginCloseConfirmation(for: closeTarget)
- return
+ return true
}
- if let card = waterfallCard(at: event.locationInWindow) {
+ if let card = waterfallCard(at: windowLocation) {
clickWindowCard(card)
- return
+ return true
}
- if let segment = spaceLaneSegment(at: event.locationInWindow) {
- clickSpaceLaneSegment(segment, clickCount: max(1, event.clickCount))
- return
+ if let segment = spaceLaneSegment(at: windowLocation) {
+ clickSpaceLaneSegment(segment, clickCount: max(1, clickCount))
+ return true
}
- if let item = appShelfItem(at: event.locationInWindow) {
+ if let item = appShelfIconItem(at: windowLocation) {
+ if let closeTarget = appShelfCloseButtonTarget(at: windowLocation) {
+ beginCloseConfirmation(for: closeTarget)
+ } else {
+ clickAppShelfItem(item)
+ }
+ return true
+ }
+
+ if let closeTarget = closeButtonTarget(at: windowLocation) {
+ beginCloseConfirmation(for: closeTarget)
+ return true
+ }
+
+ if let item = appShelfItem(at: windowLocation) {
clickAppShelfItem(item)
- return
+ return true
}
DevelopmentDiagnostics.log("quickSwitch.view.mouseDown.miss", [
- "x": event.locationInWindow.x,
- "y": event.locationInWindow.y,
+ "x": windowLocation.x,
+ "y": windowLocation.y,
"bounds": NSStringFromRect(bounds)
])
- if !suppressEventBackgroundClicks, onBackgroundClick?() == true {
- return
+ if allowBackgroundClick, !suppressEventBackgroundClicks, onBackgroundClick?() == true {
+ return true
}
- super.mouseDown(with: event)
+ return false
}
func setDebugHoveredAppGroupIndex(_ index: Int?) {
@@ -644,11 +902,49 @@
layoutSubtreeIfNeeded()
for command in commands {
let measurementStart = CACurrentMediaTime()
- performKeyboardCommand(command)
+ if !performDebugPhysicalIndexKeyCommand(command) {
+ performKeyboardCommand(command)
+ }
layoutSubtreeIfNeeded()
CATransaction.flush()
keyboardResponseLatencyMilliseconds.append(milliseconds(since: measurementStart))
}
+ }
+
+ private func performDebugPhysicalIndexKeyCommand(_ rawCommand: String) -> Bool {
+ let command = rawCommand.trimmingCharacters(in: .whitespacesAndNewlines)
+ let uppercased = command.uppercased()
+ let prefixes = ["PHYSICAL-INDEX:", "PHYSICAL-INDEX-", "KEYDOWN:", "KEYDOWN-"]
+ guard let prefix = prefixes.first(where: { uppercased.hasPrefix($0) }) else {
+ return false
+ }
+
+ let symbolStart = command.index(command.startIndex, offsetBy: prefix.count)
+ guard let symbol = appShelfIndexSymbol(fromKeyboardCommand: String(command[symbolStart...])),
+ let keyCode = Self.appShelfIndexKeyCodes[symbol],
+ let event = NSEvent.keyEvent(
+ with: .keyDown,
+ location: .zero,
+ modifierFlags: [.option],
+ timestamp: ProcessInfo.processInfo.systemUptime,
+ windowNumber: window?.windowNumber ?? 0,
+ context: nil,
+ characters: symbol.lowercased(),
+ charactersIgnoringModifiers: symbol.lowercased(),
+ isARepeat: false,
+ keyCode: keyCode
+ )
+ else {
+ recordKeyboardCommand("invalidPhysicalIndex:\(command)")
+ selectionChangedByLastCommand = false
+ return true
+ }
+
+ let previousSuppressEventInput = suppressEventInput
+ suppressEventInput = false
+ keyDown(with: event)
+ suppressEventInput = previousSuppressEventInput
+ return true
}
func performDebugMouseCommands(_ commands: [String]) {
@@ -721,6 +1017,15 @@
waterfallColumnScrollOffsets = [:]
horizontalMasonryScrollOffset = 0
horizontalMasonryContentHeight = 0
+ needsLayout = true
+ }
+
+ func setTheme(_ theme: ThemePreference) {
+ let normalizedTheme = Self.normalizedQuickSwitchTheme(theme)
+ guard themePreference != normalizedTheme else { return }
+
+ themePreference = normalizedTheme
+ applyThemeToBackdrop()
needsLayout = true
}
@@ -871,6 +1176,13 @@
keyboardCommandsApplied = []
lastKeyboardCommand = nil
lastKeyboardAppIndexCommand = nil
+ appShelfIndexKeyDownCount = 0
+ lastAppShelfIndexKeySymbol = nil
+ clearWindowIndexKeyPending()
+ lastWindowIndexKeyCommand = nil
+ lastWindowIndexKeyCommitCode = nil
+ windowShortcutFilterPhase = .none
+ lastWindowShortcutPreCommitFilterSnapshot = nil
lastBoundaryBounceAxis = nil
lastBoundaryBounceDirection = nil
boundaryBounceCount = 0
@@ -915,6 +1227,7 @@
needsLayout = true
ensureCurrentSelectionVisible(horizontalIntent: .alignWithAppShelf(animated: false))
+ refreshHoverTargetAfterViewRebuild()
needsLayout = true
if animatedProjection, let transitionSnapshot {
layoutSubtreeIfNeeded()
@@ -1189,6 +1502,7 @@
let firstFrameGatePassed = firstFrameP95.map { $0 < 150 } ?? false
let keyboardGatePassed = keyboardP95.map { $0 < 50 } ?? false
let hoverGatePassed = hoverP95.map { $0 <= 32 } ?? false
+ let shortcutFilterReport = makeWindowShortcutFilterReport()
return [
"viewClass": String(describing: Self.self),
@@ -1232,6 +1546,20 @@
"viewModeToggleStandardBlueColor": colorDictionary(from: viewModeToggleBlueColor.cgColor),
"viewModeToggleGlyphLineWidth": Double(ViewModeToggleMetrics.glyphLineWidth),
"viewModeToggleAccessibilityLabel": viewModeToggleAccessibilityLabel,
+ "themeCurrentPreference": themePreference.rawValue,
+ "themeResolved": resolvedTheme.rawValue,
+ "themeNextPreference": nextThemePreference.rawValue,
+ "themeToggleButtonVisible": !themeToggleButtonLayer.isHidden,
+ "themeToggleButtonHovered": isThemeToggleButtonHovered,
+ "themeToggleHoverPreviewSuppressed": suppressThemeToggleHoverPreview,
+ "themeToggleButtonFrame": dictionary(from: themeToggleButtonLayer.frame),
+ "themeToggleHitSize": Double(ViewModeToggleMetrics.hitSize),
+ "themeToggleVisualSize": Double(ViewModeToggleMetrics.visualSize),
+ "themeToggleIconKind": "halfDisk",
+ "themeToggleAccessibilityLabel": themeToggleAccessibilityLabel,
+ "darkBackdropLayerCount": darkBackdropLayerCount,
+ "darkBackdropLayersVisible": darkBackdropLayersVisible,
+ "darkBackdropBackgroundGradientColors": backgroundGradientColorReports(),
"settingsButtonVisible": false,
"spaceFocusAppGroupIndexes": spaceFocusedAppGroupIndexes(),
"appHoverAssociatedSpaceIDs": appHoverAssociatedSpaceIDs.sorted(),
@@ -1262,6 +1590,14 @@
"appShelfHoverIconSize": Double(AppShelfMetrics.hoverIconSize),
"appShelfSelectedIconSize": Double(AppShelfMetrics.selectedIconSize),
"appShelfMinIconSize": Double(AppShelfMetrics.minIconSize),
+ "appShelfMagneticHoverEnabled": appShelfMagneticHoverEnabled,
+ "appShelfMagneticFirstNeighborInfluence": Double(AppShelfMetrics.magneticFirstNeighborInfluence),
+ "appShelfMagneticSecondNeighborInfluence": Double(AppShelfMetrics.magneticSecondNeighborInfluence),
+ "appShelfMagneticHoverLift": Double(AppShelfMetrics.magneticHoverLift),
+ "appShelfMagneticFirstNeighborLift": Double(AppShelfMetrics.magneticFirstNeighborLift),
+ "appShelfMagneticSecondNeighborLift": Double(AppShelfMetrics.magneticSecondNeighborLift),
+ "appShelfMagneticAnimationDurationMilliseconds": Double(AppShelfMetrics.magneticAnimationDuration * 1_000),
+ "appShelfMagneticAnimationTimingName": AppShelfMetrics.magneticAnimationTimingName.rawValue,
"appShelfItems": appShelfItemReports(),
"waterfallFrame": dictionary(from: waterfallLayer.frame),
"waterfallViewMode": waterfallViewMode.rawValue,
@@ -1299,6 +1635,21 @@
"keyboardCommandsApplied": keyboardCommandsApplied,
"lastKeyboardCommand": lastKeyboardCommand ?? NSNull(),
"lastKeyboardAppIndexCommand": lastKeyboardAppIndexCommand ?? NSNull(),
+ "appShelfIndexKeyDownCount": appShelfIndexKeyDownCount,
+ "lastAppShelfIndexKeySymbol": lastAppShelfIndexKeySymbol ?? NSNull(),
+ "windowIndexKeyPendingAppGroupIndex": windowIndexKeyPending?.appGroupIndex ?? NSNull(),
+ "windowIndexKeyPendingAppSymbol": windowIndexKeyPending?.appSymbol ?? NSNull(),
+ "lastWindowIndexKeyCommand": lastWindowIndexKeyCommand ?? NSNull(),
+ "lastWindowIndexKeyCommitCode": lastWindowIndexKeyCommitCode ?? NSNull(),
+ "windowShortcutFilterActive": shortcutFilterReport.active,
+ "windowShortcutFilterPhase": shortcutFilterReport.phase.rawValue,
+ "windowShortcutFilterPendingAppGroupIndex": shortcutFilterReport.pendingAppGroupIndex ?? NSNull(),
+ "windowShortcutFilterPrefix": shortcutFilterReport.prefix ?? NSNull(),
+ "windowShortcutFilterMatchedCount": shortcutFilterReport.matchedWindowIDs.count,
+ "windowShortcutFilterDimmedCount": shortcutFilterReport.dimmedWindowIDs.count,
+ "windowShortcutFilterMatchedWindowIDs": shortcutFilterReport.matchedWindowIDs.map(Int.init),
+ "windowShortcutFilterDimmedWindowIDs": shortcutFilterReport.dimmedWindowIDs.map(Int.init),
+ "lastWindowShortcutPreCommitFilterSnapshot": lastWindowShortcutPreCommitFilterSnapshot?.reportDictionary ?? NSNull(),
"lastBoundaryBounceAxis": lastBoundaryBounceAxis ?? NSNull(),
"lastBoundaryBounceDirection": lastBoundaryBounceDirection ?? NSNull(),
"boundaryBounceCount": boundaryBounceCount,
@@ -1378,6 +1729,7 @@
if let indexSymbol = appShelfIndexSymbol(fromKeyboardCommand: command) {
let recordedCommand = "app:\(indexSymbol)"
recordKeyboardCommand(recordedCommand)
+ clearWindowIndexKeyPending()
if !focusAppShelfItemForKeyboard(indexSymbol: indexSymbol, commandLabel: recordedCommand) {
selectionChangedByLastCommand = false
}
@@ -1386,6 +1738,7 @@
switch command {
case "left":
+ clearWindowIndexKeyPending()
recordKeyboardCommand("left")
if isHorizontalMasonryMode {
moveSelection(.left)
@@ -1393,6 +1746,7 @@
selectionChangedByLastCommand = false
}
case "right":
+ clearWindowIndexKeyPending()
recordKeyboardCommand("right")
if isHorizontalMasonryMode {
moveSelection(.right)
@@ -1400,6 +1754,7 @@
selectionChangedByLastCommand = false
}
case "up":
+ clearWindowIndexKeyPending()
recordKeyboardCommand("up")
if isHorizontalMasonryMode {
moveSelection(.up)
@@ -1407,6 +1762,7 @@
moveVerticalSelectionWithinFocusedColumn(.up)
}
case "down":
+ clearWindowIndexKeyPending()
recordKeyboardCommand("down")
if isHorizontalMasonryMode {
moveSelection(.down)
@@ -1414,10 +1770,12 @@
moveVerticalSelectionWithinFocusedColumn(.down)
}
case "enter", "return", "commit":
+ clearWindowIndexKeyPending()
recordKeyboardCommand("enter")
selectionChangedByLastCommand = false
commitCurrentSelection()
case "tab":
+ clearWindowIndexKeyPending()
if isHorizontalMasonryMode {
recordKeyboardCommand("tab")
moveHorizontalMasonryTabSelection()
@@ -1427,6 +1785,7 @@
selectionChangedByLastCommand = false
}
default:
+ clearWindowIndexKeyPending()
recordKeyboardCommand("unknown:\(command)")
selectionChangedByLastCommand = false
}
@@ -1438,7 +1797,6 @@
}
private func handleAppShelfIndexKey(_ event: NSEvent) -> Bool {
- guard !isHorizontalMasonryMode else { return false }
let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
guard flags.isDisjoint(with: [.command, .control]) else { return false }
guard let characters = event.charactersIgnoringModifiers,
@@ -1447,7 +1805,70 @@
return false
}
+ appShelfIndexKeyDownCount += 1
+ lastAppShelfIndexKeySymbol = symbol
+ if flags.contains(.option), handleWindowIndexKey(symbol: symbol) {
+ return true
+ }
+ clearWindowIndexKeyPending()
performKeyboardCommand(symbol)
+ return true
+ }
+
+ private func handleWindowIndexKey(symbol: String) -> Bool {
+ let now = CACurrentMediaTime()
+ if let pending = validWindowIndexKeyPending(now: now) {
+ let code = "\(pending.appSymbol)\(symbol)"
+ if let card = waterfallCard(appGroupIndex: pending.appGroupIndex, windowIndexSymbol: symbol) {
+ recordKeyboardCommand("window:\(code)")
+ lastWindowIndexKeyCommand = "window:\(code)"
+ lastWindowIndexKeyCommitCode = code
+ lastWindowShortcutPreCommitFilterSnapshot = makeWindowShortcutPreCommitFilterSnapshot(
+ target: card,
+ code: code
+ )
+ windowShortcutFilterPhase = .targetPreCommit
+ clearWindowIndexKeyPending(resetShortcutFilter: false)
+ commitKeyboardWindowCard(card, trigger: "windowIndexKey")
+ return true
+ }
+
+ recordKeyboardCommand("windowInvalid:\(code)")
+ lastWindowIndexKeyCommand = "windowInvalid:\(code)"
+ lastWindowIndexKeyCommitCode = nil
+ windowShortcutFilterPhase = .invalid
+ lastWindowShortcutPreCommitFilterSnapshot = nil
+ selectionChangedByLastCommand = false
+ clearWindowIndexKeyPending(resetShortcutFilter: false)
+ return true
+ }
+
+ let recordedCommand = "app:\(symbol)"
+ recordKeyboardCommand(recordedCommand)
+ lastWindowIndexKeyCommand = nil
+ lastWindowIndexKeyCommitCode = nil
+ if focusAppShelfItemForKeyboard(indexSymbol: symbol, commandLabel: recordedCommand),
+ let ordinal = Self.appShelfIndexSymbols.firstIndex(of: symbol),
+ ordinal < appShelfItems.count {
+ let appGroupIndex = appShelfItems[ordinal].item.appGroupIndex
+ if let card = singleVisibleWaterfallCard(appGroupIndex: appGroupIndex) {
+ recordKeyboardCommand("windowSingle:\(symbol)")
+ lastWindowIndexKeyCommand = "windowSingle:\(symbol)"
+ lastWindowIndexKeyCommitCode = symbol
+ lastWindowShortcutPreCommitFilterSnapshot = nil
+ clearWindowIndexKeyPending()
+ commitKeyboardWindowCard(card, trigger: "windowIndexSingleApp")
+ } else {
+ setWindowIndexKeyPending(
+ appSymbol: symbol,
+ appGroupIndex: appGroupIndex,
+ startedAt: now
+ )
+ }
+ } else {
+ selectionChangedByLastCommand = false
+ clearWindowIndexKeyPending()
+ }
return true
}
@@ -1476,6 +1897,63 @@
appGroupIndex: appShelfItems[ordinal].item.appGroupIndex,
appIndexCommand: commandLabel
)
+ }
+
+ private func validWindowIndexKeyPending(now: CFTimeInterval) -> WindowIndexKeyPending? {
+ guard let pending = windowIndexKeyPending else { return nil }
+ guard now - pending.startedAt <= Self.windowIndexKeyPendingInterval else {
+ clearWindowIndexKeyPending()
+ return nil
+ }
+ return pending
+ }
+
+ private func setWindowIndexKeyPending(appSymbol: String, appGroupIndex: Int, startedAt: CFTimeInterval) {
+ windowIndexKeyPendingClearTask?.cancel()
+ windowIndexKeyPending = WindowIndexKeyPending(
+ appSymbol: appSymbol,
+ appGroupIndex: appGroupIndex,
+ startedAt: startedAt
+ )
+ windowShortcutFilterPhase = .appPending
+ lastWindowShortcutPreCommitFilterSnapshot = nil
+ needsLayout = true
+ windowIndexKeyPendingClearTask = Task { @MainActor [weak self] in
+ do {
+ try await Task.sleep(nanoseconds: UInt64(Self.windowIndexKeyPendingInterval * 1_000_000_000))
+ } catch {
+ return
+ }
+ guard let self,
+ let pending = self.windowIndexKeyPending,
+ pending.appSymbol == appSymbol,
+ pending.appGroupIndex == appGroupIndex,
+ pending.startedAt == startedAt
+ else {
+ return
+ }
+ self.windowIndexKeyPending = nil
+ self.windowIndexKeyPendingClearTask = nil
+ self.windowShortcutFilterPhase = .expired
+ self.lastWindowShortcutPreCommitFilterSnapshot = nil
+ self.needsLayout = true
+ }
+ }
+
+ private func clearWindowIndexKeyPending(resetShortcutFilter: Bool = true) {
+ let hadFilterState = windowIndexKeyPending != nil
+ || windowShortcutFilterPhase != .none
+ || lastWindowShortcutPreCommitFilterSnapshot != nil
+ windowIndexKeyPendingClearTask?.cancel()
+ windowIndexKeyPendingClearTask = nil
+ windowIndexKeyPending = nil
+ if resetShortcutFilter {
+ windowShortcutFilterPhase = .none
+ lastWindowShortcutPreCommitFilterSnapshot = nil
+ }
+ if hadFilterState {
+ needsLayout = true
+ }
}
@discardableResult
@@ -1718,6 +2196,7 @@
.trimmingCharacters(in: .whitespacesAndNewlines)
.lowercased()
guard !command.isEmpty else { return }
+ clearWindowIndexKeyPending()
let parts = command.split(separator: ":").map(String.init)
switch parts.first {
@@ -1728,6 +2207,11 @@
}
recordMouseCommand("hover-app:\(appGroupIndex)")
hoverAppGroup(appGroupIndex)
+ case "reapply-view-model":
+ if let currentViewModel {
+ apply(viewModel: currentViewModel)
+ }
+ recordMouseCommand("reapply-view-model")
case "click-app" where parts.count == 2:
guard let appGroupIndex = Int(parts[1]) else {
recordMouseCommand("invalid:\(command)")
@@ -1735,6 +2219,20 @@
}
recordMouseCommand("click-app:\(appGroupIndex)")
clickAppShelfItem(appGroupIndex: appGroupIndex)
+ case "click-app-center" where parts.count == 2:
+ guard let appGroupIndex = Int(parts[1]) else {
+ recordMouseCommand("invalid:\(command)")
+ return
+ }
+ recordMouseCommand("click-app-center:\(appGroupIndex)")
+ clickAppShelfItemViaMouse(appGroupIndex: appGroupIndex, probe: .iconCenter)
+ case "click-app-near-close" where parts.count == 2:
+ guard let appGroupIndex = Int(parts[1]) else {
+ recordMouseCommand("invalid:\(command)")
+ return
+ }
+ recordMouseCommand("click-app-near-close:\(appGroupIndex)")
+ clickAppShelfItemViaMouse(appGroupIndex: appGroupIndex, probe: .nearCloseOutsideHit)
case "hover-app-close" where parts.count == 2:
guard let appGroupIndex = Int(parts[1]) else {
recordMouseCommand("invalid:\(command)")
@@ -1791,11 +2289,22 @@
recordMouseCommand("hover-view-toggle")
suppressViewModeToggleHoverPreview = false
isViewModeToggleButtonHovered = true
+ isThemeToggleButtonHovered = false
hoveredCloseTarget = nil
setHoverTarget(.none, source: .debug)
case "click-view-toggle", "click-settings":
recordMouseCommand("click-view-toggle")
clickViewModeToggleButton(source: "debug")
+ case "hover-theme-toggle":
+ recordMouseCommand("hover-theme-toggle")
+ suppressThemeToggleHoverPreview = false
+ isThemeToggleButtonHovered = true
+ isViewModeToggleButtonHovered = false
+ hoveredCloseTarget = nil
+ setHoverTarget(.none, source: .debug)
+ case "click-theme-toggle":
+ recordMouseCommand("click-theme-toggle")
+ clickThemeToggleButton(source: "debug")
case "hover-card" where parts.count == 3:
guard let appGroupIndex = Int(parts[1]), let windowIndex = Int(parts[2]) else {
recordMouseCommand("invalid:\(command)")
@@ -1864,6 +2373,7 @@
}
private func hoverAppGroup(_ appGroupIndex: Int, source: HoverTargetSource = .debug) {
+ lastKnownMouseWindowLocation = appShelfItemCenterWindowLocation(for: appGroupIndex)
updateHoverState(
appGroupIndex: appGroupIndex,
windowID: nil,
@@ -1986,6 +2496,64 @@
}
}
+ private enum AppShelfMouseClickProbe {
+ case iconCenter
+ case nearCloseOutsideHit
+ }
+
+ private func clickAppShelfItemViaMouse(appGroupIndex: Int, probe: AppShelfMouseClickProbe) {
+ guard let windowLocation = appShelfSyntheticMouseDownLocation(for: appGroupIndex, probe: probe) else {
+ DevelopmentDiagnostics.log("quickSwitch.view.clickAppShelfViaMouse.missingLocation", [
+ "appGroupIndex": appGroupIndex
+ ])
+ return
+ }
+ _ = handleMouseDown(at: windowLocation, clickCount: 1, allowBackgroundClick: false)
+ }
+
+ private func appShelfSyntheticMouseDownLocation(
+ for appGroupIndex: Int,
+ probe: AppShelfMouseClickProbe
+ ) -> CGPoint? {
+ layoutSubtreeIfNeeded()
+ guard let item = appShelfItems.first(where: { $0.item.appGroupIndex == appGroupIndex }) else {
+ return nil
+ }
+
+ let iconFrame = item.iconLayer.frame
+ let closeFrame = item.closeButton.containerLayer.frame
+ let pointInItem: CGPoint
+ switch probe {
+ case .iconCenter:
+ pointInItem = CGPoint(x: iconFrame.midX, y: iconFrame.midY)
+ case .nearCloseOutsideHit:
+ let fallbackPoint = CGPoint(
+ x: iconFrame.maxX - 4,
+ y: iconFrame.maxY - 14
+ )
+ if closeFrame.width > 0, closeFrame.height > 0 {
+ let candidate = CGPoint(x: closeFrame.minX - 4, y: closeFrame.midY)
+ pointInItem = iconFrame.contains(candidate) ? candidate : fallbackPoint
+ } else {
+ pointInItem = fallbackPoint
+ }
+ }
+
+ let pointInView = CGPoint(
+ x: glassLayer.frame.minX
+ + shelfLayer.frame.minX
+ + appShelfContentLayer.frame.minX
+ + item.containerLayer.frame.minX
+ + pointInItem.x,
+ y: glassLayer.frame.minY
+ + shelfLayer.frame.minY
+ + appShelfContentLayer.frame.minY
+ + item.containerLayer.frame.minY
+ + pointInItem.y
+ )
+ return convert(pointInView, to: nil)
+ }
+
private func scrollAppShelf(to targetOffset: CGFloat) {
layoutSubtreeIfNeeded()
let previousOffset = appShelfScrollOffset
@@ -2026,6 +2594,34 @@
private func clickWindowCard(_ card: WaterfallCardLayers) {
hoverWindowCard(card)
commitWindowCard(card, trigger: "windowCard")
+ }
+
+ private func commitKeyboardWindowCard(_ card: WaterfallCardLayers, trigger: String) {
+ let selection = QuickSwitchSelection(
+ appGroupIndex: card.item.appGroupIndex,
+ windowIndex: card.item.windowIndex,
+ windowID: card.item.window.id
+ )
+ DevelopmentDiagnostics.log("quickSwitch.view.commitKeyboardWindow", [
+ "trigger": trigger,
+ "appGroupIndex": selection.appGroupIndex,
+ "windowIndex": selection.windowIndex,
+ "windowID": selection.windowID,
+ "appName": card.item.window.app.name,
+ "appPID": card.item.window.app.processIdentifier,
+ "titleHash": DevelopmentDiagnostics.stableFingerprint(card.item.window.title),
+ "titleLength": card.item.window.title.count,
+ "titleIsEmpty": card.item.window.title.isEmpty,
+ "isMinimized": card.item.window.isMinimized,
+ "isFullscreen": card.item.window.isFullscreen,
+ "identifierSource": String(describing: card.item.window.identifierSource)
+ ])
+ currentSelection = selection
+ columnSelectionHistory[selection.appGroupIndex] = selection.windowIndex
+ lastCommittedSelection = selection
+ lastCommitSource = .keyboard
+ ensureCurrentSelectionVisible()
+ onCommitSelection?(selection, .keyboard)
}
private func commitWindowCard(_ card: WaterfallCardLayers, trigger: String) {
@@ -2078,8 +2674,26 @@
private func refreshHoverTarget(at windowLocation: CGPoint) {
guard debugHoveredAppGroupIndex == nil else { return }
+ lastKnownMouseWindowLocation = windowLocation
let target = resolveHoverTarget(at: windowLocation)
setHoverTarget(target, alignsWaterfallWithAppShelf: target.shouldAlignWaterfallWithAppShelf)
+ }
+
+ private func refreshHoverTargetAfterViewRebuild() {
+ guard debugHoveredAppGroupIndex == nil, currentViewModel != nil else { return }
+
+ layoutSubtreeIfNeeded()
+ let windowLocation = lastKnownMouseWindowLocation ?? window?.mouseLocationOutsideOfEventStream
+ guard let windowLocation else { return }
+
+ let locationInView = convert(windowLocation, from: nil)
+ guard bounds.contains(locationInView) else {
+ lastKnownMouseWindowLocation = nil
+ setHoverTarget(.none)
+ return
+ }
+
+ refreshHoverTarget(at: windowLocation)
}
private func resolveHoverTarget(at windowLocation: CGPoint) -> HoverTarget {
@@ -3012,7 +3626,7 @@
}
private func setupBackdropBlurView() {
- backdropBlurView.material = .fullScreenUI
+ backdropBlurView.material = resolvedTheme == .dark ? .hudWindow : .fullScreenUI
backdropBlurView.blendingMode = .behindWindow
backdropBlurView.state = .active
backdropBlurView.isEmphasized = false
@@ -3030,19 +3644,91 @@
addSubview(layerHostView, positioned: .above, relativeTo: backdropBlurView)
}
+ private func applyThemeToBackdrop() {
+ let palette = themePalette
+ backdropBlurView.material = resolvedTheme == .dark ? .hudWindow : .fullScreenUI
+ backgroundLayer.colors = palette.backgroundGradientColors.map(\.cgColor)
+ backgroundLayer.locations = resolvedTheme == .dark
+ ? [0, 0.44, 0.72, 1].map(NSNumber.init(value:))
+ : [0, 1].map(NSNumber.init(value:))
+ safeAreaFillLayer.backgroundColor = palette.safeAreaFill.cgColor
+
+ let showsDarkBackdrop = resolvedTheme == .dark
+ darkAmbientLeftLayer.isHidden = !showsDarkBackdrop
+ darkAmbientCenterLayer.isHidden = !showsDarkBackdrop
+ darkAmbientRightLayer.isHidden = !showsDarkBackdrop
+ darkVignetteLayer.isHidden = !showsDarkBackdrop
+ guard showsDarkBackdrop else { return }
+
+ darkAmbientLeftLayer.colors = [
+ NSColor(calibratedRed: 72 / 255, green: 56 / 255, blue: 145 / 255, alpha: 0.34).cgColor,
+ NSColor(calibratedRed: 20 / 255, green: 28 / 255, blue: 76 / 255, alpha: 0.17).cgColor,
+ NSColor.clear.cgColor
+ ]
+ darkAmbientCenterLayer.colors = [
+ NSColor(calibratedRed: 14 / 255, green: 92 / 255, blue: 130 / 255, alpha: 0.26).cgColor,
+ NSColor(calibratedRed: 12 / 255, green: 54 / 255, blue: 89 / 255, alpha: 0.16).cgColor,
+ NSColor.clear.cgColor
+ ]
+ darkAmbientRightLayer.colors = [
+ NSColor(calibratedRed: 4 / 255, green: 92 / 255, blue: 108 / 255, alpha: 0.20).cgColor,
+ NSColor(calibratedRed: 0 / 255, green: 44 / 255, blue: 54 / 255, alpha: 0.15).cgColor,
+ NSColor.clear.cgColor
+ ]
+ darkVignetteLayer.colors = [
+ NSColor.black.withAlphaComponent(0.48).cgColor,
+ NSColor.clear.cgColor,
+ NSColor.black.withAlphaComponent(0.28).cgColor
+ ]
+ darkVignetteLayer.locations = [0, 0.36, 1].map(NSNumber.init(value:))
+ }
+
+ private func layoutBackdropLayers() {
+ applyThemeToBackdrop()
+ guard resolvedTheme == .dark else { return }
+
+ let width = max(1, bounds.width)
+ let height = max(1, bounds.height)
+ darkAmbientLeftLayer.frame = CGRect(
+ x: -width * 0.18,
+ y: -height * 0.10,
+ width: width * 0.82,
+ height: height * 1.24
+ )
+ darkAmbientCenterLayer.frame = CGRect(
+ x: width * 0.24,
+ y: height * 0.10,
+ width: width * 0.52,
+ height: height * 0.74
+ )
+ darkAmbientRightLayer.frame = CGRect(
+ x: width * 0.50,
+ y: -height * 0.12,
+ width: width * 0.72,
+ height: height * 1.26
+ )
+ darkVignetteLayer.frame = bounds
+ }
+
private func setupLayers() {
guard let rootLayer = layerHostView.layer else { return }
rootLayer.masksToBounds = true
- backgroundLayer.colors = [
- NSColor.windowBackgroundColor.withAlphaComponent(0.58).cgColor,
- NSColor.controlBackgroundColor.withAlphaComponent(0.48).cgColor
- ]
backgroundLayer.startPoint = CGPoint(x: 0.5, y: 1.0)
backgroundLayer.endPoint = CGPoint(x: 0.5, y: 0.0)
rootLayer.addSublayer(backgroundLayer)
+ for ambientLayer in darkBackdropAmbientLayers {
+ ambientLayer.type = .radial
+ ambientLayer.startPoint = CGPoint(x: 0.5, y: 0.5)
+ ambientLayer.endPoint = CGPoint(x: 1.0, y: 1.0)
+ ambientLayer.isHidden = true
+ rootLayer.addSublayer(ambientLayer)
+ }
+ darkVignetteLayer.startPoint = CGPoint(x: 0.5, y: 1.0)
+ darkVignetteLayer.endPoint = CGPoint(x: 0.5, y: 0.0)
+ darkVignetteLayer.isHidden = true
+ rootLayer.addSublayer(darkVignetteLayer)
- safeAreaFillLayer.backgroundColor = NSColor.black.cgColor
rootLayer.addSublayer(safeAreaFillLayer)
glassLayer.cornerRadius = 0
@@ -3099,6 +3785,18 @@
viewModeToggleIconLayer.contentsScale = backingScaleFactor
viewModeToggleButtonLayer.addSublayer(viewModeToggleIconLayer)
glassLayer.addSublayer(viewModeToggleButtonLayer)
+
+ themeToggleButtonLayer.cornerRadius = 10
+ themeToggleButtonLayer.masksToBounds = false
+ themeToggleButtonLayer.borderWidth = 1
+ themeToggleButtonLayer.shadowColor = NSColor.black.cgColor
+ themeToggleButtonLayer.shadowOffset = CGSize(width: 0, height: -2)
+ themeToggleButtonLayer.zPosition = 170
+ themeToggleIconLayer.contentsScale = backingScaleFactor
+ themeToggleButtonLayer.addSublayer(themeToggleIconLayer)
+ glassLayer.addSublayer(themeToggleButtonLayer)
+
+ applyThemeToBackdrop()
}
private func rebuildAppShelfItems() {
@@ -3139,7 +3837,7 @@
string: item.app.name,
fontSize: 11,
weight: .regular,
- color: .secondaryLabelColor,
+ color: themePalette.appShelfLabelText,
alignment: .center
)
@@ -3191,8 +3889,8 @@
container.name = column.app.name
container.cornerRadius = 14
container.masksToBounds = true
- container.backgroundColor = NSColor.controlBackgroundColor.withAlphaComponent(0.56).cgColor
- container.borderColor = NSColor.separatorColor.withAlphaComponent(0.34).cgColor
+ container.backgroundColor = themePalette.columnBackground.cgColor
+ container.borderColor = themePalette.columnBorder.cgColor
container.borderWidth = 1
let cardsClip = CALayer()
@@ -3200,21 +3898,21 @@
cardsClip.backgroundColor = NSColor.clear.cgColor
let header = CALayer()
- header.backgroundColor = NSColor.controlBackgroundColor.withAlphaComponent(0.68).cgColor
+ header.backgroundColor = themePalette.columnHeaderBackground.cgColor
header.zPosition = 40
let appName = makeTextLayer(
string: column.app.name,
fontSize: 13,
weight: .semibold,
- color: .labelColor,
+ color: themePalette.columnText,
alignment: .center
)
let count = makeTextLayer(
string: "\(column.windows.count)",
fontSize: 11,
weight: .medium,
- color: .secondaryLabelColor,
+ color: themePalette.columnSecondaryText,
alignment: .right
)
@@ -3246,14 +3944,15 @@
string: window.window.title.isEmpty ? "Untitled Window" : window.window.title,
fontSize: 12,
weight: .medium,
- color: .labelColor
+ color: themePalette.cardText
)
title.truncationMode = .middle
let meta = makeTextLayer(
string: waterfallMetaText(for: window),
fontSize: 10,
weight: .regular,
- color: .secondaryLabelColor
+ color: themePalette.cardSecondaryText,
+ alignment: .right
)
let appIcon = CALayer()
appIcon.contentsGravity = .resizeAspect
@@ -3266,13 +3965,13 @@
string: waterfallStateText(for: window),
fontSize: 10,
weight: .medium,
- color: .secondaryLabelColor,
+ color: themePalette.cardSecondaryText,
alignment: .right
)
let shine = CAGradientLayer()
shine.colors = [
NSColor.white.withAlphaComponent(0.00).cgColor,
- NSColor.white.withAlphaComponent(0.16).cgColor,
+ themePalette.shinePeak.cgColor,
NSColor.white.withAlphaComponent(0.00).cgColor
]
shine.startPoint = CGPoint(x: 0, y: 1)
@@ -3336,7 +4035,7 @@
groupContainer.masksToBounds = false
groupContainer.borderWidth = 0
groupContainer.borderColor = NSColor.clear.cgColor
- groupContainer.backgroundColor = NSColor.windowBackgroundColor.cgColor
+ groupContainer.backgroundColor = themePalette.displayGroupBackground.cgColor
groupContainer.shadowColor = NSColor.black.cgColor
groupContainer.shadowOpacity = 0
groupContainer.shadowRadius = 0
@@ -3357,20 +4056,20 @@
string: space.label,
fontSize: 15,
weight: .semibold,
- color: .labelColor
+ color: themePalette.spaceLanePrimaryText
)
let countLayer = makeTextLayer(
string: "\(space.windowCount)",
fontSize: 12,
weight: .medium,
- color: .secondaryLabelColor,
+ color: themePalette.spaceLaneSecondaryText,
alignment: .center
)
let appLayer = makeTextLayer(
string: appIdentifierText(for: space),
fontSize: 12,
weight: space.type == .fullscreen ? .medium : .regular,
- color: space.type == .fullscreen ? .labelColor : .secondaryLabelColor,
+ color: space.type == .fullscreen ? themePalette.spaceLanePrimaryText : themePalette.spaceLaneSecondaryText,
alignment: space.type == .fullscreen ? .center : .left
)
let splitAppLayers = splitViewAppNames(for: space).map { name in
@@ -3378,7 +4077,7 @@
string: name,
fontSize: 12,
weight: .medium,
- color: .labelColor,
+ color: themePalette.spaceLanePrimaryText,
alignment: .center
)
}
@@ -3431,6 +4130,7 @@
CATransaction.setDisableActions(true)
backgroundLayer.frame = bounds
+ layoutBackdropLayers()
let safeAreaTopInset = topSafeAreaInset
safeAreaFillLayer.frame = CGRect(
@@ -3474,6 +4174,7 @@
layoutCloseConfirmation()
layoutCloseFeedback()
layoutViewModeToggleButton()
+ layoutThemeToggleButton()
CATransaction.commit()
}
@@ -3495,7 +4196,7 @@
let isSelectedState = viewModeToggleVisualStateIsSelected(visualState)
viewModeToggleButtonLayer.backgroundColor = (isSelectedState
? viewModeToggleBlueColor
- : NSColor.windowBackgroundColor.withAlphaComponent(isViewModeToggleButtonHovered ? 0.76 : 0.58)
+ : toggleIdleBackgroundColor(hovered: isViewModeToggleButtonHovered)
).cgColor
viewModeToggleButtonLayer.borderColor = (isSelectedState
? viewModeToggleBlueColor.withAlphaComponent(0.96)
@@ -3509,6 +4210,45 @@
let iconInset = ViewModeToggleMetrics.iconInset
viewModeToggleIconLayer.frame = viewModeToggleButtonLayer.bounds.insetBy(dx: iconInset, dy: iconInset)
layoutViewModeToggleIcon()
+ }
+
+ private func layoutThemeToggleButton() {
+ let size = ViewModeToggleMetrics.visualSize
+ let topMargin = topSafeAreaInset + RootLayoutMetrics.topContentMargin
+ let viewModeFrame = viewModeToggleButtonLayer.frame
+ let fallbackX = max(
+ RootLayoutMetrics.horizontalMargin,
+ glassLayer.bounds.width - RootLayoutMetrics.horizontalMargin - size * 2 - ThemeToggleMetrics.buttonGap
+ )
+ let x = max(
+ RootLayoutMetrics.horizontalMargin,
+ (viewModeFrame.width > 0 ? viewModeFrame.minX : fallbackX + size + ThemeToggleMetrics.buttonGap)
+ - ThemeToggleMetrics.buttonGap
+ - size
+ )
+ let y = max(
+ RootLayoutMetrics.bottomMargin,
+ glassLayer.bounds.height - topMargin - size
+ )
+ themeToggleButtonLayer.frame = CGRect(x: x, y: y, width: size, height: size)
+ themeToggleButtonLayer.cornerRadius = ViewModeToggleMetrics.cornerRadius
+ let isSelectedState = resolvedTheme == .dark
+ themeToggleButtonLayer.backgroundColor = (isSelectedState
+ ? viewModeToggleBlueColor
+ : themeToggleIdleBackgroundColor
+ ).cgColor
+ themeToggleButtonLayer.borderColor = (isSelectedState
+ ? viewModeToggleBlueColor.withAlphaComponent(0.96)
+ : viewModeToggleBlueColor.withAlphaComponent(isThemeToggleButtonHovered ? 0.72 : 0.34)
+ ).cgColor
+ themeToggleButtonLayer.shadowOpacity = isSelectedState ? 0.18 : (isThemeToggleButtonHovered ? 0.12 : 0.06)
+ themeToggleButtonLayer.shadowRadius = isSelectedState
+ ? ViewModeToggleMetrics.selectedShadowRadius
+ : ViewModeToggleMetrics.idleShadowRadius
+ themeToggleIconLayer.contentsScale = backingScaleFactor
+ let iconInset = ViewModeToggleMetrics.iconInset
+ themeToggleIconLayer.frame = themeToggleButtonLayer.bounds.insetBy(dx: iconInset, dy: iconInset)
+ layoutThemeToggleIcon()
}
private func layoutViewModeToggleIcon() {
@@ -3548,6 +4288,88 @@
}
CATransaction.commit()
+ }
+
+ private func layoutThemeToggleIcon() {
+ CATransaction.begin()
+ CATransaction.setDisableActions(true)
+ themeToggleIconLayer.sublayers?.forEach { $0.removeFromSuperlayer() }
+
+ let bounds = themeToggleIconLayer.bounds
+ guard bounds.width > 0, bounds.height > 0 else {
+ CATransaction.commit()
+ return
+ }
+
+ let isSelectedState = resolvedTheme == .dark
+ let strokeColor = isSelectedState
+ ? NSColor.white.withAlphaComponent(0.98)
+ : viewModeToggleBlueColor.withAlphaComponent(0.96)
+ let lightFillColor = isSelectedState
+ ? NSColor.white.withAlphaComponent(0.22)
+ : viewModeToggleBlueColor.withAlphaComponent(0.06)
+ let darkFillColor = isSelectedState
+ ? NSColor.white.withAlphaComponent(0.96)
+ : viewModeToggleBlueColor.withAlphaComponent(0.82)
+ let glyphRect = centeredSquare(in: bounds).insetBy(dx: 0.75, dy: 0.75)
+ addThemeToggleHalfDiskGlyph(
+ in: glyphRect,
+ strokeColor: strokeColor,
+ lightFillColor: lightFillColor,
+ darkFillColor: darkFillColor
+ )
+
+ CATransaction.commit()
+ }
+
+ private func addThemeToggleHalfDiskGlyph(
+ in rect: CGRect,
+ strokeColor: NSColor,
+ lightFillColor: NSColor,
+ darkFillColor: NSColor
+ ) {
+ let circlePath = CGPath(
+ ellipseIn: rect,
+ transform: nil
+ )
+ let baseLayer = CAShapeLayer()
+ baseLayer.contentsScale = backingScaleFactor
+ baseLayer.frame = themeToggleIconLayer.bounds
+ baseLayer.path = circlePath
+ baseLayer.fillColor = lightFillColor.cgColor
+ baseLayer.strokeColor = NSColor.clear.cgColor
+ themeToggleIconLayer.addSublayer(baseLayer)
+
+ let radius = min(rect.width, rect.height) / 2
+ let center = CGPoint(x: rect.midX, y: rect.midY)
+ let halfPath = CGMutablePath()
+ halfPath.move(to: CGPoint(x: center.x, y: center.y + radius))
+ halfPath.addArc(
+ center: center,
+ radius: radius,
+ startAngle: .pi / 2,
+ endAngle: .pi * 1.5,
+ clockwise: false
+ )
+ halfPath.closeSubpath()
+
+ let halfLayer = CAShapeLayer()
+ halfLayer.contentsScale = backingScaleFactor
+ halfLayer.frame = themeToggleIconLayer.bounds
+ halfLayer.path = halfPath
+ halfLayer.fillColor = darkFillColor.cgColor
+ halfLayer.strokeColor = NSColor.clear.cgColor
+ themeToggleIconLayer.addSublayer(halfLayer)
+
+ let outlineLayer = CAShapeLayer()
+ outlineLayer.contentsScale = backingScaleFactor
+ outlineLayer.frame = themeToggleIconLayer.bounds
+ outlineLayer.path = circlePath
+ outlineLayer.fillColor = NSColor.clear.cgColor
+ outlineLayer.strokeColor = strokeColor.cgColor
+ outlineLayer.lineWidth = ViewModeToggleMetrics.glyphLineWidth
+ outlineLayer.lineJoin = .round
+ themeToggleIconLayer.addSublayer(outlineLayer)
}
private func addVerticalColumnsToggleGlyph(
@@ -3686,12 +4508,17 @@
}
private func appShelfHeight(forRows rows: Int) -> CGFloat {
- switch rows {
- case 0, 1:
- return 92
- default:
- return 148
- }
+ appShelfRowsHeight(forRows: max(1, rows)) + AppShelfMetrics.verticalPadding
+ }
+
+ private func appShelfRowsHeight(forRows rows: Int) -> CGFloat {
+ let rowCount = max(1, rows)
+ return CGFloat(rowCount) * AppShelfMetrics.rowHeight
+ + CGFloat(rowCount - 1) * appShelfRowGap(forRows: rowCount)
+ }
+
+ private func appShelfRowGap(forRows rows: Int) -> CGFloat {
+ rows > 1 ? AppShelfMetrics.rowGap : 0
}
private var appShelfSlotPadding: CGFloat {
@@ -3793,7 +4620,7 @@
|| segment.space.id == currentViewModel?.lockedSpaceID
}
let hasCurrentSegment = group.display.spaces.contains { $0.isCurrent }
- group.containerLayer.backgroundColor = NSColor.windowBackgroundColor.cgColor
+ group.containerLayer.backgroundColor = themePalette.displayGroupBackground.cgColor
group.containerLayer.borderColor = NSColor.clear.cgColor
group.containerLayer.borderWidth = 0
group.containerLayer.shadowOpacity = 0
@@ -3824,8 +4651,8 @@
: hasWindows
? spaceLaneOccupiedColor.withAlphaComponent(isCurrent ? 0.54 : 0.44)
: isCurrent
- ? NSColor.labelColor.withAlphaComponent(0.34)
- : NSColor.separatorColor.withAlphaComponent(0.34)
+ ? themePalette.spaceLanePrimaryText.withAlphaComponent(0.34)
+ : themePalette.columnBorder.withAlphaComponent(resolvedTheme == .dark ? 0.58 : 0.34)
).cgColor
if isLocked {
applySpaceLaneSolidFill(
@@ -3876,17 +4703,41 @@
)
: nil
- applySpaceLaneContentVisualState(segment, isLocked: isLocked)
+ applySpaceLaneContentVisualState(
+ segment,
+ isLocked: isLocked,
+ usesLightActiveFill: resolvedTheme == .dark && hasWindows && !isLocked && (isActive || isAssociated)
+ )
}
- private func applySpaceLaneContentVisualState(_ segment: SpaceLaneSegmentLayers, isLocked: Bool) {
- let primaryTextColor: NSColor = isLocked ? .white : .labelColor
+ private func applySpaceLaneContentVisualState(
+ _ segment: SpaceLaneSegmentLayers,
+ isLocked: Bool,
+ usesLightActiveFill: Bool
+ ) {
+ let primaryTextColor: NSColor = isLocked
+ ? .white
+ : usesLightActiveFill
+ ? NSColor.black.withAlphaComponent(0.82)
+ : themePalette.spaceLanePrimaryText
let secondaryTextColor: NSColor = isLocked
? .white
- : .secondaryLabelColor
+ : usesLightActiveFill
+ ? NSColor.black.withAlphaComponent(0.58)
+ : themePalette.spaceLaneSecondaryText
+ let markerTextColor: NSColor = isLocked
+ ? .white
+ : usesLightActiveFill
+ ? NSColor.black.withAlphaComponent(0.62)
+ : themePalette.spaceLaneSecondaryText.withAlphaComponent(segment.space.isCurrent ? 0.72 : 0.54)
+ let blockColor: NSColor = isLocked
+ ? .white
+ : usesLightActiveFill
+ ? NSColor.black.withAlphaComponent(0.20)
+ : spaceLaneOccupiedColor.withAlphaComponent(segment.space.isCurrent ? 0.72 : 0.58)
segment.labelLayer.foregroundColor = primaryTextColor.cgColor
- segment.countLayer.foregroundColor = (isLocked ? NSColor.white : .secondaryLabelColor).cgColor
+ segment.countLayer.foregroundColor = secondaryTextColor.cgColor
segment.appLayer.foregroundColor = (segment.space.type == .fullscreen
? primaryTextColor
: secondaryTextColor
@@ -3896,16 +4747,10 @@
}
for block in segment.windowBlocks {
- block.backgroundColor = (isLocked
- ? NSColor.white
- : spaceLaneOccupiedColor.withAlphaComponent(segment.space.isCurrent ? 0.72 : 0.58)
- ).cgColor
+ block.backgroundColor = blockColor.cgColor
}
- (segment.fullscreenMarkerLayer as? CAShapeLayer)?.strokeColor = (isLocked
- ? NSColor.white
- : NSColor.secondaryLabelColor.withAlphaComponent(segment.space.isCurrent ? 0.42 : 0.28)
- ).cgColor
+ (segment.fullscreenMarkerLayer as? CAShapeLayer)?.strokeColor = markerTextColor.cgColor
}
private func shouldScrollSpaceLane(for event: NSEvent) -> Bool {
@@ -3990,6 +4835,18 @@
.contains(locationInGlass)
}
+ private func themeToggleButtonContains(windowLocation: CGPoint) -> Bool {
+ let locationInView = convert(windowLocation, from: nil)
+ let locationInGlass = CGPoint(
+ x: locationInView.x - glassLayer.frame.minX,
+ y: locationInView.y - glassLayer.frame.minY
+ )
+ let hitOutset = (ViewModeToggleMetrics.hitSize - ViewModeToggleMetrics.visualSize) / 2
+ return themeToggleButtonLayer.frame
+ .insetBy(dx: -hitOutset, dy: -hitOutset)
+ .contains(locationInGlass)
+ }
+
private func clickViewModeToggleButton(source: String) {
DevelopmentDiagnostics.log("quickSwitch.view.clickWaterfallViewModeToggle", [
"source": source,
@@ -4005,38 +4862,97 @@
onToggleWaterfallViewMode?()
}
+ private func clickThemeToggleButton(source: String) {
+ DevelopmentDiagnostics.log("quickSwitch.view.clickThemeToggle", [
+ "source": source,
+ "currentTheme": resolvedTheme.rawValue,
+ "targetTheme": nextThemePreference.rawValue
+ ])
+ lastMouseCommand = "click-theme-toggle"
+ if !mouseCommandsApplied.contains("click-theme-toggle") {
+ mouseCommandsApplied.append("click-theme-toggle")
+ }
+ isThemeToggleButtonHovered = false
+ suppressThemeToggleHoverPreview = true
+ onToggleTheme?()
+ }
+
private func appShelfItem(at windowLocation: CGPoint) -> AppShelfItemLayers? {
- let locationInView = convert(windowLocation, from: nil)
- let locationInShelfContent = CGPoint(
- x: locationInView.x - glassLayer.frame.minX - shelfLayer.frame.minX - appShelfContentLayer.frame.minX,
- y: locationInView.y - glassLayer.frame.minY - shelfLayer.frame.minY - appShelfContentLayer.frame.minY
- )
+ let locationInShelfContent = appShelfContentLocation(at: windowLocation)
return appShelfItems.first { item in
- item.containerLayer.frame.contains(locationInShelfContent)
+ interactiveFrame(for: item.containerLayer).contains(locationInShelfContent)
}
+ }
+
+ private func appShelfIconItem(at windowLocation: CGPoint) -> AppShelfItemLayers? {
+ let locationInAppShelfContent = appShelfContentLocation(at: windowLocation)
+
+ return appShelfItems.first { item in
+ let itemFrame = interactiveFrame(for: item.containerLayer)
+ let locationInItem = CGPoint(
+ x: locationInAppShelfContent.x - itemFrame.minX,
+ y: locationInAppShelfContent.y - itemFrame.minY
+ )
+ return interactiveFrame(for: item.iconLayer).contains(locationInItem)
+ }
+ }
+
+ private func appShelfContentLocation(at windowLocation: CGPoint) -> CGPoint {
+ let locationInView = convert(windowLocation, from: nil)
+ let glassFrame = interactiveFrame(for: glassLayer)
+ let shelfFrame = interactiveFrame(for: shelfLayer)
+ let appShelfContentFrame = interactiveFrame(for: appShelfContentLayer)
+
+ return CGPoint(
+ x: locationInView.x - glassFrame.minX - shelfFrame.minX - appShelfContentFrame.minX,
+ y: locationInView.y - glassFrame.minY - shelfFrame.minY - appShelfContentFrame.minY
+ )
+ }
+
+ private func appShelfItemCenterWindowLocation(for appGroupIndex: Int) -> CGPoint? {
+ guard let item = appShelfItems.first(where: { $0.item.appGroupIndex == appGroupIndex }) else {
+ return nil
+ }
+
+ let pointInView = CGPoint(
+ x: glassLayer.frame.minX
+ + shelfLayer.frame.minX
+ + appShelfContentLayer.frame.minX
+ + item.containerLayer.frame.midX,
+ y: glassLayer.frame.minY
+ + shelfLayer.frame.minY
+ + appShelfContentLayer.frame.minY
+ + item.containerLayer.frame.midY
+ )
+ return convert(pointInView, to: nil)
}
private func waterfallCard(at windowLocation: CGPoint) -> WaterfallCardLayers? {
let locationInView = convert(windowLocation, from: nil)
+ let glassFrame = interactiveFrame(for: glassLayer)
+ let waterfallFrame = interactiveFrame(for: waterfallLayer)
+ let waterfallContentFrame = interactiveFrame(for: waterfallContentLayer)
let locationInWaterfallContent = CGPoint(
- x: locationInView.x - glassLayer.frame.minX - waterfallLayer.frame.minX - waterfallContentLayer.frame.minX,
- y: locationInView.y - glassLayer.frame.minY - waterfallLayer.frame.minY - waterfallContentLayer.frame.minY
+ x: locationInView.x - glassFrame.minX - waterfallFrame.minX - waterfallContentFrame.minX,
+ y: locationInView.y - glassFrame.minY - waterfallFrame.minY - waterfallContentFrame.minY
)
- for column in waterfallColumns where column.containerLayer.frame.contains(locationInWaterfallContent) {
+ for column in waterfallColumns where interactiveFrame(for: column.containerLayer).contains(locationInWaterfallContent) {
+ let columnFrame = interactiveFrame(for: column.containerLayer)
+ let cardsClipFrame = interactiveFrame(for: column.cardsClipLayer)
let locationInColumn = CGPoint(
- x: locationInWaterfallContent.x - column.containerLayer.frame.minX,
- y: locationInWaterfallContent.y - column.containerLayer.frame.minY
+ x: locationInWaterfallContent.x - columnFrame.minX,
+ y: locationInWaterfallContent.y - columnFrame.minY
)
- guard column.cardsClipLayer.frame.contains(locationInColumn) else {
+ guard cardsClipFrame.contains(locationInColumn) else {
continue
}
let locationInCardsClip = CGPoint(
- x: locationInColumn.x - column.cardsClipLayer.frame.minX,
- y: locationInColumn.y - column.cardsClipLayer.frame.minY
+ x: locationInColumn.x - cardsClipFrame.minX,
+ y: locationInColumn.y - cardsClipFrame.minY
)
- if let card = column.cards.first(where: { $0.containerLayer.frame.contains(locationInCardsClip) }) {
+ if let card = column.cards.first(where: { interactiveFrame(for: $0.containerLayer).contains(locationInCardsClip) }) {
return card
}
}
@@ -4044,11 +4960,24 @@
return nil
}
+ private func interactiveFrame(for layer: CALayer) -> CGRect {
+ layer.presentation()?.frame ?? layer.frame
+ }
+
private func waterfallCard(appGroupIndex: Int, windowIndex: Int) -> WaterfallCardLayers? {
waterfallColumns
.first(where: { $0.column.appGroupIndex == appGroupIndex })?
.cards
.first(where: { $0.item.windowIndex == windowIndex })
+ }
+
+ private func waterfallCard(appGroupIndex: Int, windowIndexSymbol: String) -> WaterfallCardLayers? {
+ guard let ordinal = Self.appShelfIndexSymbols.firstIndex(of: windowIndexSymbol),
+ ordinal < Self.appShelfIndexSymbols.count
+ else {
+ return nil
+ }
+ return waterfallCard(appGroupIndex: appGroupIndex, windowIndex: ordinal)
}
private func waterfallCard(windowID: UInt32) -> WaterfallCardLayers? {
@@ -4131,8 +5060,8 @@
let iconSize = appShelfLayout.iconSize
let gap = appShelfGap(forIconSize: iconSize)
let itemWidth = appShelfSlotWidth(forIconSize: iconSize)
- let rowHeight: CGFloat = AppShelfMetrics.selectedIconSize + 18
- let rowGap: CGFloat = appShelfLayout.rows > 1 ? 8 : 0
+ let rowHeight = AppShelfMetrics.rowHeight
+ let rowGap = appShelfRowGap(forRows: rows.count)
let innerWidth = max(1, shelfLayer.bounds.width - 24)
let maxRowWidth = rows
.map { widthForAppShelfItems(count: $0.count, itemWidth: itemWidth, gap: gap) }
@@ -4146,7 +5075,7 @@
height: shelfLayer.bounds.height
)
- let totalRowsHeight = CGFloat(rows.count) * rowHeight + CGFloat(max(0, rows.count - 1)) * rowGap
+ let totalRowsHeight = appShelfRowsHeight(forRows: rows.count)
var y = shelfLayer.bounds.midY + totalRowsHeight / 2 - rowHeight
for row in rows {
@@ -4169,50 +5098,69 @@
let isHovered = item.item.appGroupIndex == effectiveHoveredAppGroupIndex
let showsSelectedVisual = shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered)
let isSpaceFocused = spaceFocusWindowCount(for: item.item.appGroupIndex) > 0
+ let magneticState = appShelfMagneticState(for: item)
let visualIconSize = appShelfVisualIconSize(
forBaseIconSize: iconSize,
selected: showsSelectedVisual,
hovered: isHovered,
- spaceFocused: isSpaceFocused
+ spaceFocused: isSpaceFocused,
+ magneticState: magneticState
)
- let backgroundPadding: CGFloat = (showsSelectedVisual || isHovered)
- ? 4
- : isSpaceFocused
- ? 6
- : 2
+ let backgroundPadding: CGFloat = isSpaceFocused ? 6 : 2
let iconX = (bounds.width - visualIconSize) / 2
- let iconY = bounds.height - visualIconSize - 2
+ let iconY = bounds.height - visualIconSize - 2 + magneticState.lift
let badgeText = appShelfBadgeText(for: item)
let badgeWidth = max(18, CGFloat(badgeText.count) * 7 + 8)
+
+ let previousBackgroundFrame = item.backgroundLayer.presentation()?.frame ?? item.backgroundLayer.frame
+ let previousIconFrame = item.iconLayer.presentation()?.frame ?? item.iconLayer.frame
+ let previousIndexFrame = item.indexLayer.presentation()?.frame ?? item.indexLayer.frame
+ let previousBadgeFrame = item.badgeLayer.presentation()?.frame ?? item.badgeLayer.frame
+ let previousCloseFrame = item.closeButton.containerLayer.presentation()?.frame
+ ?? item.closeButton.containerLayer.frame
item.containerLayer.zPosition = appShelfZPosition(
selected: showsSelectedVisual,
hovered: isHovered,
- spaceFocused: isSpaceFocused
+ spaceFocused: isSpaceFocused,
+ magneticState: magneticState
)
item.backgroundLayer.backgroundColor = appShelfBackgroundColor(
selected: showsSelectedVisual,
hovered: isHovered,
- spaceFocused: isSpaceFocused
+ spaceFocused: isSpaceFocused,
+ magneticState: magneticState
).cgColor
- item.backgroundLayer.borderColor = (showsSelectedVisual
- ? NSColor.controlAccentColor.withAlphaComponent(0.40)
- : isHovered
- ? NSColor.controlAccentColor.withAlphaComponent(0.36)
- : NSColor.clear
- ).cgColor
- item.backgroundLayer.borderWidth = (showsSelectedVisual || isHovered) ? 1 : 0
+ item.backgroundLayer.borderColor = NSColor.clear.cgColor
+ item.backgroundLayer.borderWidth = 0
+ item.containerLayer.borderColor = NSColor.clear.cgColor
+ item.containerLayer.borderWidth = 0
+ item.iconLayer.borderColor = NSColor.clear.cgColor
+ item.iconLayer.borderWidth = 0
item.backgroundLayer.shadowColor = NSColor.black.cgColor
- item.backgroundLayer.shadowOpacity = showsSelectedVisual ? 0.11 : isHovered ? 0.07 : isSpaceFocused ? 0.18 : 0
- item.backgroundLayer.shadowRadius = showsSelectedVisual ? 10 : isHovered ? 8 : isSpaceFocused ? 18 : 0
- item.backgroundLayer.shadowOffset = CGSize(width: 0, height: isSpaceFocused ? -4 : -2)
+ item.backgroundLayer.shadowOpacity = appShelfShadowOpacity(
+ selected: showsSelectedVisual,
+ hovered: isHovered,
+ spaceFocused: isSpaceFocused,
+ magneticState: magneticState
+ )
+ item.backgroundLayer.shadowRadius = appShelfShadowRadius(
+ selected: showsSelectedVisual,
+ hovered: isHovered,
+ spaceFocused: isSpaceFocused,
+ magneticState: magneticState
+ )
+ item.backgroundLayer.shadowOffset = CGSize(
+ width: 0,
+ height: isSpaceFocused ? -4 : magneticState.isNeighbor ? -1 : -2
+ )
item.backgroundLayer.frame = CGRect(
x: iconX - backgroundPadding,
y: iconY - backgroundPadding,
width: visualIconSize + backgroundPadding * 2,
height: visualIconSize + backgroundPadding * 2
)
- item.backgroundLayer.shadowPath = (showsSelectedVisual || isHovered || isSpaceFocused)
+ item.backgroundLayer.shadowPath = isSpaceFocused
? CGPath(
roundedRect: item.backgroundLayer.bounds,
cornerWidth: item.backgroundLayer.cornerRadius,
@@ -4229,6 +5177,7 @@
highlighted: showsSelectedVisual || isHovered
)
item.labelLayer.contentsScale = backingScaleFactor
+ item.labelLayer.foregroundColor = themePalette.appShelfLabelText.cgColor
item.labelLayer.frame = CGRect(x: 0, y: 0, width: bounds.width, height: 14)
item.badgeLayer.string = badgeText
item.badgeLayer.isHidden = badgeText.isEmpty
@@ -4253,14 +5202,20 @@
)
item.selectedIndicatorLayer.frame = .zero
item.selectedIndicatorLayer.backgroundColor = NSColor.clear.cgColor
+
+ animateAppShelfLayerFrame(item.backgroundLayer, from: previousBackgroundFrame)
+ animateAppShelfLayerFrame(item.iconLayer, from: previousIconFrame)
+ animateAppShelfLayerFrame(item.indexLayer, from: previousIndexFrame)
+ animateAppShelfLayerFrame(item.badgeLayer, from: previousBadgeFrame)
+ animateAppShelfLayerFrame(item.closeButton.containerLayer, from: previousCloseFrame)
}
private var appShelfIndexColor: NSColor {
- NSColor.labelColor.withAlphaComponent(0.48)
+ themePalette.appShelfIndexText
}
private var appShelfIndexHighlightedColor: NSColor {
- NSColor.labelColor.withAlphaComponent(0.58)
+ themePalette.appShelfIndexHighlightedText
}
private func appShelfIndexFont(size: CGFloat) -> NSFont {
@@ -4335,6 +5290,75 @@
private var effectiveHoveredAppGroupIndex: Int? {
debugHoveredAppGroupIndex ?? hoveredAppGroupIndex
+ }
+
+ private var appShelfMagneticHoverEnabled: Bool {
+ !NSWorkspace.shared.accessibilityDisplayShouldReduceMotion
+ }
+
+ private func appShelfMagneticState(for item: AppShelfItemLayers) -> AppShelfMagneticState {
+ guard appShelfMagneticHoverEnabled,
+ let hoveredAppGroupIndex = effectiveHoveredAppGroupIndex,
+ item.item.appGroupIndex == hoveredAppGroupIndex
+ else {
+ return AppShelfMagneticState(influence: 0, lift: 0)
+ }
+
+ return AppShelfMagneticState(
+ influence: 1,
+ lift: AppShelfMetrics.magneticHoverLift
+ )
+ }
+
+ private func animateAppShelfLayerFrame(_ layer: CALayer, from previousFrame: CGRect) {
+ guard appShelfMagneticHoverEnabled,
+ previousFrame.width > 0,
+ previousFrame.height > 0,
+ appShelfFrameIsFinite(previousFrame),
+ appShelfFrameIsFinite(layer.frame)
+ else {
+ layer.removeAnimation(forKey: "appShelfMagneticPosition")
+ layer.removeAnimation(forKey: "appShelfMagneticBounds")
+ return
+ }
+
+ let previousPosition = CGPoint(x: previousFrame.midX, y: previousFrame.midY)
+ let previousBounds = CGRect(origin: .zero, size: previousFrame.size)
+ let nextPosition = layer.position
+ let nextBounds = layer.bounds
+ let moved = abs(previousPosition.x - nextPosition.x) > 0.25
+ || abs(previousPosition.y - nextPosition.y) > 0.25
+ let resized = abs(previousBounds.width - nextBounds.width) > 0.25
+ || abs(previousBounds.height - nextBounds.height) > 0.25
+
+ guard moved || resized else { return }
+
+ let timing = CAMediaTimingFunction(name: AppShelfMetrics.magneticAnimationTimingName)
+ if moved {
+ let animation = CABasicAnimation(keyPath: "position")
+ animation.fromValue = previousPosition
+ animation.toValue = nextPosition
+ animation.duration = AppShelfMetrics.magneticAnimationDuration
+ animation.timingFunction = timing
+ animation.isRemovedOnCompletion = true
+ layer.add(animation, forKey: "appShelfMagneticPosition")
+ }
+ if resized {
+ let animation = CABasicAnimation(keyPath: "bounds")
+ animation.fromValue = previousBounds
+ animation.toValue = nextBounds
+ animation.duration = AppShelfMetrics.magneticAnimationDuration
+ animation.timingFunction = timing
+ animation.isRemovedOnCompletion = true
+ layer.add(animation, forKey: "appShelfMagneticBounds")
+ }
+ }
+
+ private func appShelfFrameIsFinite(_ frame: CGRect) -> Bool {
+ frame.origin.x.isFinite
+ && frame.origin.y.isFinite
+ && frame.size.width.isFinite
+ && frame.size.height.isFinite
}
private var activeSpaceFocusID: UInt64? {
@@ -4457,7 +5481,8 @@
forBaseIconSize iconSize: CGFloat,
selected: Bool,
hovered: Bool,
- spaceFocused: Bool
+ spaceFocused: Bool,
+ magneticState: AppShelfMagneticState
) -> CGFloat {
if selected || hovered {
return AppShelfMetrics.selectedIconSize
@@ -4465,10 +5490,19 @@
if spaceFocused {
return min(AppShelfMetrics.selectedIconSize, iconSize + 8)
}
- return iconSize
+ guard magneticState.isNeighbor else {
+ return iconSize
+ }
+ let growth = AppShelfMetrics.hoverIconSize - iconSize
+ return iconSize + growth * magneticState.influence
}
- private func appShelfZPosition(selected: Bool, hovered: Bool, spaceFocused: Bool) -> CGFloat {
+ private func appShelfZPosition(
+ selected: Bool,
+ hovered: Bool,
+ spaceFocused: Bool,
+ magneticState: AppShelfMagneticState
+ ) -> CGFloat {
switch (selected, hovered, spaceFocused) {
case (true, true, _):
return 30
@@ -4479,21 +5513,44 @@
case (false, false, true):
return 12
case (false, false, false):
- return 0
+ return magneticState.isNeighbor ? 6 + magneticState.influence : 0
}
}
- private func appShelfBackgroundColor(selected: Bool, hovered: Bool, spaceFocused: Bool) -> NSColor {
- if selected {
- return NSColor.controlAccentColor.withAlphaComponent(0.14)
- }
- if hovered {
- return NSColor.controlAccentColor.withAlphaComponent(0.13)
- }
+ private func appShelfBackgroundColor(
+ selected: Bool,
+ hovered: Bool,
+ spaceFocused: Bool,
+ magneticState: AppShelfMagneticState
+ ) -> NSColor {
if spaceFocused {
- return NSColor.controlAccentColor.withAlphaComponent(0.14)
+ return themePalette.appShelfBackgroundSpaceFocused
}
return .clear
+ }
+
+ private func appShelfShadowOpacity(
+ selected: Bool,
+ hovered: Bool,
+ spaceFocused: Bool,
+ magneticState: AppShelfMagneticState
+ ) -> Float {
+ if spaceFocused {
+ return 0.18
+ }
+ return 0
+ }
+
+ private func appShelfShadowRadius(
+ selected: Bool,
+ hovered: Bool,
+ spaceFocused: Bool,
+ magneticState: AppShelfMagneticState
+ ) -> CGFloat {
+ if spaceFocused {
+ return 18
+ }
+ return 0
}
private func appShelfBadgeText(for item: AppShelfItemLayers) -> String {
@@ -4516,7 +5573,7 @@
}
private var waterfallAppHoverHeaderFillColor: NSColor {
- NSColor.systemGray.withAlphaComponent(0.22)
+ themePalette.columnHeaderHoverBackground
}
private var appShelfMaxScrollOffset: CGFloat {
@@ -4731,7 +5788,7 @@
private func layoutWaterfallColumn(_ column: WaterfallColumnLayers) {
column.containerLayer.cornerRadius = 14
column.containerLayer.masksToBounds = true
- column.containerLayer.backgroundColor = NSColor.controlBackgroundColor.withAlphaComponent(0.56).cgColor
+ column.containerLayer.backgroundColor = themePalette.columnBackground.cgColor
column.containerLayer.shadowOpacity = 0
column.containerLayer.shadowRadius = 0
column.containerLayer.shadowOffset = .zero
@@ -4751,8 +5808,8 @@
let isSpaceFocused = spaceFocusWindowCount(for: column.column.appGroupIndex) > 0
let isHovered = column.column.appGroupIndex == effectiveHoveredAppGroupIndex
column.containerLayer.borderColor = (isSpaceFocused
- ? NSColor.separatorColor.withAlphaComponent(0.38)
- : NSColor.separatorColor.withAlphaComponent(0.24)
+ ? themePalette.columnBorder.withAlphaComponent(resolvedTheme == .dark ? 0.34 : 0.38)
+ : themePalette.columnBorder
).cgColor
column.containerLayer.borderWidth = 1
column.headerLayer.frame = CGRect(
@@ -4764,8 +5821,8 @@
column.headerLayer.backgroundColor = (isHovered
? waterfallAppHoverHeaderFillColor
: (isSpaceFocused
- ? NSColor.systemFill.withAlphaComponent(0.10)
- : NSColor.controlBackgroundColor.withAlphaComponent(0.52))
+ ? themePalette.columnHeaderSpaceFocusedBackground
+ : themePalette.columnHeaderBackground)
).cgColor
column.appNameLayer.frame = CGRect(
x: WaterfallMetrics.columnHeaderTextInset,
@@ -4773,14 +5830,14 @@
width: max(1, bounds.width - WaterfallMetrics.columnHeaderTextInset * 2),
height: 16
)
- column.appNameLayer.foregroundColor = NSColor.labelColor.cgColor
+ column.appNameLayer.foregroundColor = themePalette.columnText.cgColor
column.countLayer.frame = CGRect(
x: bounds.width - 48,
y: bounds.height - 24,
width: 36,
height: 16
)
- column.countLayer.foregroundColor = NSColor.secondaryLabelColor.cgColor
+ column.countLayer.foregroundColor = themePalette.columnSecondaryText.cgColor
let appGroupIndex = column.column.appGroupIndex
let verticalOffset = clampedWaterfallColumnOffset(
@@ -4818,13 +5875,15 @@
let isKeyboardFocused = card.item.window.id == keyboardFocusedWindowID
let isHorizontalAppDefaultFocused = isHorizontalAppDefaultCard(card)
let isAppLinked = isWaterfallCardAppLinked(card)
+ let shortcutFilterState = windowShortcutFilterState(for: card)
applyWaterfallCardVisualState(
card,
selected: shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered)
|| isKeyboardFocused
|| isHorizontalAppDefaultFocused,
hovered: isHovered,
- appLinked: isAppLinked
+ appLinked: isAppLinked,
+ shortcutFilterState: shortcutFilterState
)
let outerInset: CGFloat = 0
@@ -4857,18 +5916,21 @@
width: max(1, titleBarFrame.width - 68),
height: 16
)
+ card.titleLayer.foregroundColor = themePalette.cardText.cgColor
card.metaLayer.frame = CGRect(
x: titleBarFrame.maxX - 38,
y: titleBarFrame.minY + 6,
width: 30,
height: 14
)
+ card.metaLayer.foregroundColor = themePalette.cardSecondaryText.cgColor
card.stateLayer.frame = CGRect(
x: thumbnailFrame.maxX - 86,
y: thumbnailFrame.minY + 6,
width: 78,
height: 14
)
+ card.stateLayer.foregroundColor = themePalette.cardSecondaryText.cgColor
layoutCloseButton(
card.closeButton,
target: .window(
@@ -4876,7 +5938,7 @@
windowIndex: card.item.windowIndex,
windowID: card.item.window.id
),
- visible: isHovered,
+ visible: isHovered && shortcutFilterState != .dimmed,
anchorTopRight: CGPoint(x: bounds.maxX - 12, y: bounds.maxY - 12)
)
card.shineLayer.frame = CGRect(
@@ -4885,25 +5947,33 @@
width: max(36, min(96, bounds.width * 0.24)),
height: bounds.height
)
+ card.shineLayer.colors = [
+ NSColor.white.withAlphaComponent(0.00).cgColor,
+ themePalette.shinePeak.cgColor,
+ NSColor.white.withAlphaComponent(0.00).cgColor
+ ]
}
private func applyWaterfallCardVisualState(
_ card: WaterfallCardLayers,
selected: Bool,
hovered: Bool,
- appLinked: Bool
+ appLinked: Bool,
+ shortcutFilterState: WindowShortcutFilterState
) {
let isSpaceFocused = isWaterfallCardSpaceFocused(card)
+ let isShortcutDimmed = shortcutFilterState == .dimmed
card.containerLayer.backgroundColor = (selected
- ? NSColor.windowBackgroundColor.withAlphaComponent(0.94)
+ ? themePalette.cardSelectedBackground
: hovered
? accentTintedWindowBackground(fraction: 0.09, alpha: 0.95)
: appLinked
? accentTintedWindowBackground(fraction: 0.08, alpha: 0.93)
: isSpaceFocused
? accentTintedWindowBackground(fraction: 0.10, alpha: 0.94)
- : NSColor.windowBackgroundColor.withAlphaComponent(0.82)
+ : themePalette.cardBackground
).cgColor
+ card.containerLayer.opacity = isShortcutDimmed ? windowShortcutFilterDimOpacity : 1
card.containerLayer.borderColor = (selected
? NSColor.controlAccentColor.withAlphaComponent(0.52)
: hovered
@@ -4916,7 +5986,17 @@
).cgColor
card.containerLayer.borderWidth = (selected || hovered || appLinked || isSpaceFocused) ? 1.5 : 1
card.containerLayer.shadowColor = NSColor.black.cgColor
- card.containerLayer.shadowOpacity = selected ? 0.24 : hovered ? 0.14 : appLinked ? 0.16 : isSpaceFocused ? 0.20 : 0
+ let darkShadowBoost: Float = resolvedTheme == .dark ? 0.08 : 0
+ let baseShadowOpacity: Float = selected
+ ? 0.24 + darkShadowBoost
+ : hovered
+ ? 0.14 + darkShadowBoost
+ : appLinked
+ ? 0.16 + darkShadowBoost
+ : isSpaceFocused
+ ? 0.20 + darkShadowBoost
+ : 0
+ card.containerLayer.shadowOpacity = isShortcutDimmed ? min(baseShadowOpacity, 0.03) : baseShadowOpacity
card.containerLayer.shadowRadius = selected ? 22 : hovered ? 17 : appLinked ? 18 : isSpaceFocused ? 24 : 0
card.containerLayer.shadowOffset = selected
? CGSize(width: 0, height: -6)
@@ -4929,10 +6009,10 @@
: .zero
card.containerLayer.zPosition = selected ? 20 : hovered ? 12 : appLinked ? 10 : isSpaceFocused ? 8 : 0
let focusedScale: CGFloat = selected ? WaterfallMetrics.selectedCardScale : isSpaceFocused ? 1.012 : 1.008
- card.containerLayer.transform = (selected || hovered || isSpaceFocused)
+ card.containerLayer.transform = (!isShortcutDimmed && (selected || hovered || isSpaceFocused))
? CATransform3DMakeScale(focusedScale, focusedScale, 1)
: CATransform3DIdentity
- card.containerLayer.shadowPath = (selected || hovered || appLinked || isSpaceFocused)
+ card.containerLayer.shadowPath = (!isShortcutDimmed && (selected || hovered || appLinked || isSpaceFocused))
? CGPath(
roundedRect: card.containerLayer.bounds,
cornerWidth: card.containerLayer.cornerRadius,
@@ -4948,7 +6028,7 @@
).cgColor
card.titleBarLayer.borderColor = NSColor.clear.cgColor
card.titleBarLayer.borderWidth = 0
- card.shineLayer.opacity = selected ? 1 : 0
+ card.shineLayer.opacity = (!isShortcutDimmed && selected) ? 1 : 0
}
private func layoutCloseButton(
@@ -5051,9 +6131,16 @@
)
layers.backgroundLayer.frame = layers.containerLayer.bounds
layers.backgroundLayer.path = bubblePath
+ layers.backgroundLayer.fillColor = themePalette.closeFeedbackBackground.withAlphaComponent(resolvedTheme == .dark ? 0.98 : 0.985).cgColor
+ layers.backgroundLayer.strokeColor = themePalette.closeFeedbackBorder.withAlphaComponent(resolvedTheme == .dark ? 0.78 : 1).cgColor
layers.containerLayer.shadowPath = bubblePath
layers.titleLayer.string = confirmationTitle(for: request)
layers.messageLayer.string = confirmationMessage(for: request)
+ layers.titleLayer.foregroundColor = (resolvedTheme == .dark
+ ? NSColor.white.withAlphaComponent(0.92)
+ : NSColor.labelColor
+ ).cgColor
+ layers.messageLayer.foregroundColor = themePalette.closeFeedbackText.cgColor
layers.titleLayer.frame = CGRect(x: contentFrame.minX + 22, y: height - 48, width: contentFrame.width - 44, height: 22)
layers.messageLayer.frame = CGRect(x: contentFrame.minX + 22, y: height - 78, width: contentFrame.width - 44, height: 21)
@@ -5064,12 +6151,22 @@
).cgColor
layers.checkboxLayer.borderColor = (pendingCloseOptOut
? NSColor.controlAccentColor.withAlphaComponent(0.95)
- : NSColor.separatorColor.withAlphaComponent(0.48)
+ : themePalette.closeFeedbackBorder.withAlphaComponent(resolvedTheme == .dark ? 0.80 : 0.48)
).cgColor
layers.checkboxMarkLayer.string = pendingCloseOptOut ? "✓" : ""
layers.checkboxMarkLayer.frame = CGRect(x: 0, y: 1, width: 18, height: 16)
+ layers.checkboxLabelLayer.foregroundColor = themePalette.closeFeedbackText.cgColor
layers.checkboxLabelLayer.frame = CGRect(x: contentFrame.minX + 48, y: 80, width: contentFrame.width - 70, height: 19)
+ layers.cancelButtonLayer.backgroundColor = (resolvedTheme == .dark
+ ? NSColor.white.withAlphaComponent(0.10)
+ : NSColor.systemFill.withAlphaComponent(0.16)
+ ).cgColor
+ layers.cancelButtonLayer.borderColor = themePalette.closeFeedbackBorder.withAlphaComponent(resolvedTheme == .dark ? 0.70 : 0.22).cgColor
+ layers.cancelButtonTextLayer.foregroundColor = (resolvedTheme == .dark
+ ? NSColor.white.withAlphaComponent(0.86)
+ : NSColor.labelColor
+ ).cgColor
layers.cancelButtonLayer.frame = CGRect(x: contentFrame.maxX - 164, y: 22, width: 74, height: 32)
layers.cancelButtonTextLayer.frame = layers.cancelButtonLayer.bounds.insetBy(dx: 0, dy: 7)
layers.confirmButtonLayer.frame = CGRect(x: contentFrame.maxX - 78, y: 22, width: 56, height: 32)
@@ -5084,9 +6181,9 @@
closeFeedbackTextLayer.string = feedback.message
switch feedback.kind {
case .progress:
- closeFeedbackLayer.backgroundColor = NSColor.windowBackgroundColor.withAlphaComponent(0.94).cgColor
- closeFeedbackLayer.borderColor = NSColor.separatorColor.withAlphaComponent(0.28).cgColor
- closeFeedbackTextLayer.foregroundColor = NSColor.secondaryLabelColor.withAlphaComponent(0.96).cgColor
+ closeFeedbackLayer.backgroundColor = themePalette.closeFeedbackBackground.cgColor
+ closeFeedbackLayer.borderColor = themePalette.closeFeedbackBorder.cgColor
+ closeFeedbackTextLayer.foregroundColor = themePalette.closeFeedbackText.cgColor
case .failure:
closeFeedbackLayer.backgroundColor = NSColor.systemRed.withAlphaComponent(0.10).cgColor
closeFeedbackLayer.borderColor = NSColor.systemRed.withAlphaComponent(0.32).cgColor
@@ -5372,11 +6469,7 @@
}
private func appShelfCloseButtonTarget(at windowLocation: NSPoint) -> CloseTarget? {
- let locationInView = convert(windowLocation, from: nil)
- let locationInAppShelfContent = CGPoint(
- x: locationInView.x - glassLayer.frame.minX - shelfLayer.frame.minX - appShelfContentLayer.frame.minX,
- y: locationInView.y - glassLayer.frame.minY - shelfLayer.frame.minY - appShelfContentLayer.frame.minY
- )
+ let locationInAppShelfContent = appShelfContentLocation(at: windowLocation)
for item in appShelfItems {
let target = CloseTarget.app(appGroupIndex: item.item.appGroupIndex)
@@ -5384,43 +6477,59 @@
canClose(app: item.item.app)
else { continue }
+ let itemFrame = interactiveFrame(for: item.containerLayer)
+ let closeFrame = interactiveFrame(for: item.closeButton.containerLayer)
let locationInItem = CGPoint(
- x: locationInAppShelfContent.x - item.containerLayer.frame.minX,
- y: locationInAppShelfContent.y - item.containerLayer.frame.minY
+ x: locationInAppShelfContent.x - itemFrame.minX,
+ y: locationInAppShelfContent.y - itemFrame.minY
)
- if item.closeButton.containerLayer.frame.insetBy(dx: -8, dy: -8).contains(locationInItem) {
+ if appShelfCloseHitFrame(for: closeFrame).contains(locationInItem) {
return target
}
}
return nil
}
+ private func appShelfCloseHitFrame(for closeFrame: CGRect) -> CGRect {
+ closeFrame.insetBy(
+ dx: -AppShelfMetrics.closeButtonHitOutset,
+ dy: -AppShelfMetrics.closeButtonHitOutset
+ )
+ }
+
private func waterfallCloseButtonTarget(at windowLocation: NSPoint) -> CloseTarget? {
let locationInView = convert(windowLocation, from: nil)
+ let glassFrame = interactiveFrame(for: glassLayer)
+ let waterfallFrame = interactiveFrame(for: waterfallLayer)
+ let waterfallContentFrame = interactiveFrame(for: waterfallContentLayer)
let locationInWaterfallContent = CGPoint(
- x: locationInView.x - glassLayer.frame.minX - waterfallLayer.frame.minX - waterfallContentLayer.frame.minX,
- y: locationInView.y - glassLayer.frame.minY - waterfallLayer.frame.minY - waterfallContentLayer.frame.minY
+ x: locationInView.x - glassFrame.minX - waterfallFrame.minX - waterfallContentFrame.minX,
+ y: locationInView.y - glassFrame.minY - waterfallFrame.minY - waterfallContentFrame.minY
)
- for column in waterfallColumns where column.containerLayer.frame.contains(locationInWaterfallContent) {
+ for column in waterfallColumns where interactiveFrame(for: column.containerLayer).contains(locationInWaterfallContent) {
+ let columnFrame = interactiveFrame(for: column.containerLayer)
+ let cardsClipFrame = interactiveFrame(for: column.cardsClipLayer)
let locationInColumn = CGPoint(
- x: locationInWaterfallContent.x - column.containerLayer.frame.minX,
- y: locationInWaterfallContent.y - column.containerLayer.frame.minY
+ x: locationInWaterfallContent.x - columnFrame.minX,
+ y: locationInWaterfallContent.y - columnFrame.minY
)
- guard column.cardsClipLayer.frame.contains(locationInColumn) else {
+ guard cardsClipFrame.contains(locationInColumn) else {
continue
}
let locationInCardsClip = CGPoint(
- x: locationInColumn.x - column.cardsClipLayer.frame.minX,
- y: locationInColumn.y - column.cardsClipLayer.frame.minY
+ x: locationInColumn.x - cardsClipFrame.minX,
+ y: locationInColumn.y - cardsClipFrame.minY
)
- for card in column.cards where card.containerLayer.frame.contains(locationInCardsClip) {
+ for card in column.cards where interactiveFrame(for: card.containerLayer).contains(locationInCardsClip) {
guard card.closeButton.containerLayer.opacity > 0 else { continue }
+ let cardFrame = interactiveFrame(for: card.containerLayer)
+ let closeFrame = interactiveFrame(for: card.closeButton.containerLayer)
let locationInCard = CGPoint(
- x: locationInCardsClip.x - card.containerLayer.frame.minX,
- y: locationInCardsClip.y - card.containerLayer.frame.minY
+ x: locationInCardsClip.x - cardFrame.minX,
+ y: locationInCardsClip.y - cardFrame.minY
)
- if card.closeButton.containerLayer.frame.insetBy(dx: -8, dy: -8).contains(locationInCard) {
+ if closeFrame.insetBy(dx: -8, dy: -8).contains(locationInCard) {
return .window(
appGroupIndex: card.item.appGroupIndex,
windowIndex: card.item.windowIndex,
@@ -5474,8 +6583,9 @@
}
private func accentTintedWindowBackground(fraction: CGFloat, alpha: CGFloat) -> NSColor {
- let color = NSColor.windowBackgroundColor.blended(withFraction: fraction, of: NSColor.controlAccentColor)
- ?? NSColor.windowBackgroundColor
+ let baseColor = resolvedTheme == .dark ? themePalette.cardBackground : NSColor.windowBackgroundColor
+ let color = baseColor.blended(withFraction: fraction, of: NSColor.controlAccentColor)
+ ?? baseColor
return color.withAlphaComponent(alpha)
}
@@ -5527,12 +6637,45 @@
waterfallViewMode == .horizontalMasonry
}
+ private var resolvedTheme: QuickSwitchResolvedTheme {
+ themePreference == .dark ? .dark : .light
+ }
+
+ private var themePalette: QuickSwitchThemePalette {
+ QuickSwitchThemePalette.palette(for: resolvedTheme)
+ }
+
+ private var darkBackdropAmbientLayers: [CAGradientLayer] {
+ [darkAmbientLeftLayer, darkAmbientCenterLayer, darkAmbientRightLayer]
+ }
+
+ private static func normalizedQuickSwitchTheme(_ theme: ThemePreference) -> ThemePreference {
+ theme == .dark ? .dark : .light
+ }
+
+ private var nextThemePreference: ThemePreference {
+ resolvedTheme == .dark ? .light : .dark
+ }
+
private var nextWaterfallViewMode: QuickSwitchWaterfallViewMode {
isHorizontalMasonryMode ? .verticalColumns : .horizontalMasonry
}
private var viewModeToggleBlueColor: NSColor {
NSColor(deviceRed: 135.0 / 255.0, green: 200.0 / 255.0, blue: 1, alpha: 1)
+ }
+
+ private var themeToggleIdleBackgroundColor: NSColor {
+ toggleIdleBackgroundColor(hovered: isThemeToggleButtonHovered)
+ }
+
+ private func toggleIdleBackgroundColor(hovered: Bool) -> NSColor {
+ switch resolvedTheme {
+ case .light:
+ return NSColor.windowBackgroundColor.withAlphaComponent(hovered ? 0.76 : 0.58)
+ case .dark:
+ return NSColor(calibratedRed: 24 / 255, green: 34 / 255, blue: 54 / 255, alpha: hovered ? 0.76 : 0.58)
+ }
}
private var viewModeToggleVisualState: ViewModeToggleVisualState {
@@ -5561,6 +6704,15 @@
return "切换到纵栏瀑布"
case .horizontalMasonry:
return "切换到横栏瀑布"
+ }
+ }
+
+ private var themeToggleAccessibilityLabel: String {
+ switch nextThemePreference {
+ case .dark:
+ return "切换到深色皮肤"
+ case .light, .system:
+ return "切换到浅色皮肤"
}
}
@@ -5606,7 +6758,130 @@
}
private func waterfallMetaText(for card: QuickSwitchWindowCardViewModel) -> String {
- card.primarySpaceLabel ?? "No Space"
+ windowShortcutCode(for: card) ?? ""
+ }
+
+ private func windowShortcutCode(for card: QuickSwitchWindowCardViewModel) -> String? {
+ guard let appOrdinal = appShelfItems.firstIndex(where: { $0.item.appGroupIndex == card.appGroupIndex }),
+ let appSymbol = singleIndexSymbol(forOrdinal: appOrdinal),
+ let windowSymbol = singleIndexSymbol(forOrdinal: card.windowIndex)
+ else {
+ return nil
+ }
+ return "\(appSymbol)\(windowSymbol)"
+ }
+
+ private func singleIndexSymbol(forOrdinal ordinal: Int) -> String? {
+ guard ordinal >= 0,
+ ordinal < Self.appShelfIndexSymbols.count
+ else {
+ return nil
+ }
+ return Self.appShelfIndexSymbols[ordinal]
+ }
+
+ private var visibleWaterfallCards: [WaterfallCardLayers] {
+ waterfallColumns.flatMap(\.cards)
+ }
+
+ private func singleVisibleWaterfallCard(appGroupIndex: Int) -> WaterfallCardLayers? {
+ let cards = visibleWaterfallCards.filter { $0.item.appGroupIndex == appGroupIndex }
+ return cards.count == 1 ? cards[0] : nil
+ }
+
+ private var windowShortcutFilterDimOpacity: Float {
+ resolvedTheme == .dark ? 0.44 : 0.38
+ }
+
+ private func windowShortcutFilterState(for card: WaterfallCardLayers) -> WindowShortcutFilterState {
+ switch windowShortcutFilterPhase {
+ case .appPending:
+ guard let pending = windowIndexKeyPending else { return .none }
+ return card.item.appGroupIndex == pending.appGroupIndex ? .matched : .dimmed
+ case .targetPreCommit:
+ guard let snapshot = lastWindowShortcutPreCommitFilterSnapshot else { return .none }
+ if card.item.window.id == snapshot.targetWindowID {
+ return .target
+ }
+ if snapshot.dimmedWindowIDs.contains(card.item.window.id) {
+ return .dimmed
+ }
+ if snapshot.matchedWindowIDs.contains(card.item.window.id) {
+ return .matched
+ }
+ return .none
+ case .none, .invalid, .expired:
+ return .none
+ }
+ }
+
+ private func makeWindowShortcutPreCommitFilterSnapshot(
+ target card: WaterfallCardLayers,
+ code: String
+ ) -> WindowShortcutPreCommitFilterSnapshot {
+ let targetWindowID = card.item.window.id
+ let allWindowIDs = visibleWaterfallCards.map { $0.item.window.id }
+ return WindowShortcutPreCommitFilterSnapshot(
+ targetCode: code,
+ targetWindowID: targetWindowID,
+ matchedWindowIDs: [targetWindowID],
+ dimmedWindowIDs: allWindowIDs.filter { $0 != targetWindowID }.sorted()
+ )
+ }
+
+ private func makeWindowShortcutFilterReport() -> WindowShortcutFilterReport {
+ switch windowShortcutFilterPhase {
+ case .appPending:
+ guard let pending = windowIndexKeyPending else {
+ return emptyWindowShortcutFilterReport(phase: .none)
+ }
+ let cards = visibleWaterfallCards
+ let matched = cards
+ .filter { $0.item.appGroupIndex == pending.appGroupIndex }
+ .map { $0.item.window.id }
+ .sorted()
+ let dimmed = cards
+ .filter { $0.item.appGroupIndex != pending.appGroupIndex }
+ .map { $0.item.window.id }
+ .sorted()
+ return WindowShortcutFilterReport(
+ active: true,
+ phase: .appPending,
+ pendingAppGroupIndex: pending.appGroupIndex,
+ prefix: pending.appSymbol,
+ matchedWindowIDs: matched,
+ dimmedWindowIDs: dimmed
+ )
+ case .targetPreCommit:
+ guard let snapshot = lastWindowShortcutPreCommitFilterSnapshot else {
+ return emptyWindowShortcutFilterReport(phase: .none)
+ }
+ return WindowShortcutFilterReport(
+ active: true,
+ phase: .targetPreCommit,
+ pendingAppGroupIndex: nil,
+ prefix: snapshot.targetCode,
+ matchedWindowIDs: snapshot.matchedWindowIDs,
+ dimmedWindowIDs: snapshot.dimmedWindowIDs
+ )
+ case .invalid, .expired:
+ return emptyWindowShortcutFilterReport(phase: windowShortcutFilterPhase)
+ case .none:
+ return emptyWindowShortcutFilterReport(phase: .none)
+ }
+ }
+
+ private func emptyWindowShortcutFilterReport(
+ phase: WindowShortcutFilterPhase
+ ) -> WindowShortcutFilterReport {
+ WindowShortcutFilterReport(
+ active: false,
+ phase: phase,
+ pendingAppGroupIndex: nil,
+ prefix: nil,
+ matchedWindowIDs: [],
+ dimmedWindowIDs: []
+ )
}
private func waterfallStateText(for card: QuickSwitchWindowCardViewModel) -> String {
@@ -5625,7 +6900,7 @@
}
private var spaceLaneOccupiedColor: NSColor {
- if effectiveAppearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua {
+ if resolvedTheme == .dark {
return NSColor(calibratedRed: 10 / 255, green: 132 / 255, blue: 1, alpha: 1)
}
@@ -5633,7 +6908,7 @@
}
private var spaceLaneLockedFillColor: NSColor {
- if effectiveAppearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua {
+ if resolvedTheme == .dark {
return NSColor(calibratedRed: 58 / 255, green: 148 / 255, blue: 1, alpha: 0.86)
}
@@ -5641,9 +6916,9 @@
}
private func spaceLaneIdleOccupiedGradientColors() -> [NSColor] {
- if effectiveAppearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua {
- let blue = NSColor(calibratedRed: 36 / 255, green: 54 / 255, blue: 72 / 255, alpha: 1)
- let surface = NSColor.windowBackgroundColor.withAlphaComponent(1)
+ if resolvedTheme == .dark {
+ let blue = NSColor(calibratedRed: 18 / 255, green: 42 / 255, blue: 70 / 255, alpha: 0.92)
+ let surface = NSColor(calibratedRed: 22 / 255, green: 34 / 255, blue: 50 / 255, alpha: 0.78)
return [blue, surface]
}
@@ -5656,7 +6931,7 @@
private func applySpaceLaneGradientFill(to layer: CALayer, colors: [NSColor]) {
if let gradientLayer = layer as? CAGradientLayer {
gradientLayer.colors = colors.map(\.cgColor)
- gradientLayer.locations = [0, 1]
+ gradientLayer.locations = [0, 1].map(NSNumber.init(value:))
gradientLayer.startPoint = CGPoint(x: 0.5, y: 1.0)
gradientLayer.endPoint = CGPoint(x: 0.5, y: 0.0)
}
@@ -5945,6 +7220,7 @@
private func appShelfItemReports() -> [[String: Any]] {
appShelfItems.enumerated().map { index, item in
let visibleFrame = item.containerLayer.frame.offsetBy(dx: appShelfContentLayer.frame.minX, dy: 0)
+ let magneticState = appShelfMagneticState(for: item)
return [
"index": index,
"name": item.item.app.name,
@@ -5955,13 +7231,25 @@
"isSelected": item.item.appGroupIndex == effectiveSelection?.appGroupIndex,
"isHovered": item.item.appGroupIndex == effectiveHoveredAppGroupIndex,
"isSpaceFocused": spaceFocusWindowCount(for: item.item.appGroupIndex) > 0,
+ "isMagneticNeighbor": magneticState.isNeighbor,
+ "magneticInfluence": Double(magneticState.influence),
+ "magneticLift": Double(magneticState.lift),
"visualStates": appShelfVisualStates(for: item),
"zPosition": Double(item.containerLayer.zPosition),
"hasMinimizedWindows": item.item.hasMinimizedWindows,
"hasFullscreenWindows": item.item.hasFullscreenWindows,
"frame": dictionary(from: item.containerLayer.frame),
"visibleFrame": dictionary(from: visibleFrame),
+ "containerBorderWidth": Double(item.containerLayer.borderWidth),
+ "containerBorderColor": colorDictionary(from: item.containerLayer.borderColor),
"iconFrame": dictionary(from: item.iconLayer.frame),
+ "iconBorderWidth": Double(item.iconLayer.borderWidth),
+ "iconBorderColor": colorDictionary(from: item.iconLayer.borderColor),
+ "backgroundFrame": dictionary(from: item.backgroundLayer.frame),
+ "backgroundColor": colorDictionary(from: item.backgroundLayer.backgroundColor),
+ "backgroundBorderWidth": Double(item.backgroundLayer.borderWidth),
+ "backgroundShadowOpacity": Double(item.backgroundLayer.shadowOpacity),
+ "backgroundShadowRadius": Double(item.backgroundLayer.shadowRadius),
"indexText": item.indexLayer.string ?? "",
"indexFrame": dictionary(from: item.indexLayer.frame),
"indexVisible": !item.indexLayer.isHidden && item.indexLayer.opacity > 0,
@@ -5974,6 +7262,7 @@
"badgeText": item.badgeLayer.string ?? "",
"closeButtonVisible": item.closeButton.containerLayer.opacity > 0,
"closeButtonFrame": dictionary(from: item.closeButton.containerLayer.frame),
+ "closeButtonHitFrame": dictionary(from: appShelfCloseHitFrame(for: item.closeButton.containerLayer.frame)),
"closeButtonSize": Double(item.closeButton.containerLayer.bounds.width),
"closeButtonFillColor": colorDictionary(from: item.closeButton.containerLayer.backgroundColor),
"closeButtonGlyphColor": colorDictionary(from: item.closeButton.glyphLayer.strokeColor),
@@ -5986,6 +7275,7 @@
var states: [String] = []
let isSelected = item.item.appGroupIndex == effectiveSelection?.appGroupIndex
let isHovered = item.item.appGroupIndex == effectiveHoveredAppGroupIndex
+ let magneticState = appShelfMagneticState(for: item)
if shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) {
states.append("selected")
} else if isSelected {
@@ -5993,6 +7283,9 @@
}
if isHovered {
states.append("hover")
+ }
+ if magneticState.isNeighbor {
+ states.append("magneticNeighbor")
}
if spaceFocusWindowCount(for: item.item.appGroupIndex) > 0 {
states.append("spaceFocused")
@@ -6115,6 +7408,10 @@
dy: column.containerLayer.frame.minY + column.cardsClipLayer.frame.minY
)
let screenshotSource = screenshotSourcesByWindowID[card.item.window.id]
+ let shortcutFilterState = windowShortcutFilterState(for: card)
+ let shortcutFilterOpacity = shortcutFilterState == .dimmed
+ ? windowShortcutFilterDimOpacity
+ : Float(1)
var report = [
"appGroupIndex": card.item.appGroupIndex,
@@ -6126,12 +7423,15 @@
"titleIsEmpty": card.item.window.title.isEmpty,
"primarySpaceID": card.item.primarySpaceID ?? NSNull(),
"primarySpaceLabel": card.item.primarySpaceLabel ?? NSNull(),
+ "windowShortcutCode": waterfallMetaText(for: card.item),
"isMinimized": card.item.window.isMinimized,
"isFullscreen": card.item.window.isFullscreen,
"identifierSource": "\(card.item.window.identifierSource)",
"isSelected": card.item.window.id == effectiveSelection?.windowID,
"isKeyboardFocused": card.item.window.id == keyboardFocusedWindowID,
"isHorizontalAppDefault": isHorizontalAppDefaultCard(card),
+ "windowShortcutFilterState": shortcutFilterState.rawValue,
+ "windowShortcutFilterOpacity": Double(shortcutFilterOpacity),
"visualStates": waterfallCardVisualStates(for: card),
"thumbnailStrategy": thumbnailStrategyString(for: card.item.window),
"screenshotSource": screenshotSourceString(screenshotSource, for: card.item.window),
@@ -6276,6 +7576,16 @@
if isWaterfallCardSpaceFocused(card) {
states.append("spaceFocused")
}
+ switch windowShortcutFilterState(for: card) {
+ case .matched:
+ states.append("shortcutMatched")
+ case .dimmed:
+ states.append("shortcutDimmed")
+ case .target:
+ states.append("shortcutTarget")
+ case .none:
+ break
+ }
if card.item.window.isMinimized {
states.append("minimized")
}
@@ -6323,6 +7633,10 @@
}
let isAppAssociated = appHoverAssociatedSpaceIDs.contains(space.id)
let isWindowAssociated = space.id == windowHoverAssociatedSpaceID
+ let isLocked = space.id == currentViewModel?.lockedSpaceID
+ let isActive = space.id == activeSpaceFocusID || isLocked
+ let isAssociated = (isAppAssociated || isWindowAssociated) && !isActive
+ let usesLightActiveFill = resolvedTheme == .dark && space.windowCount > 0 && !isLocked && (isActive || isAssociated)
let group = spaceLaneDisplayGroup(containingSpaceID: space.id)
let visibleFrame = segment.containerLayer.frame.offsetBy(
dx: (group?.containerLayer.frame.minX ?? 0) + spaceLaneContentLayer.frame.minX,
@@ -6341,6 +7655,8 @@
"label": space.label,
"type": spaceTypeName(space.type),
"visualStates": visualStates(for: space),
+ "usesLightActiveFill": usesLightActiveFill,
+ "foregroundContrastStyle": usesLightActiveFill ? "darkOnLight" : "themeDefault",
"fullscreenMarkerVisible": segment.fullscreenMarkerLayer != nil,
"fullscreenMarkerKind": fullscreenMarkerKind(
markerLayer: segment.fullscreenMarkerLayer,
@@ -6501,6 +7817,20 @@
}
}
+ private var darkBackdropLayerCount: Int {
+ darkBackdropAmbientLayers.count + 1
+ }
+
+ private var darkBackdropLayersVisible: Bool {
+ resolvedTheme == .dark
+ && darkBackdropAmbientLayers.allSatisfy { !$0.isHidden }
+ && !darkVignetteLayer.isHidden
+ }
+
+ private func backgroundGradientColorReports() -> [[String: Double]] {
+ gradientColorDictionaries(from: backgroundLayer)
+ }
+
private func spaceLaneFillKind(for layer: CALayer) -> String {
if !gradientColorDictionaries(from: layer).isEmpty {
return "gradient"
--
Gitblit v1.9.3