From cb67d8b2fa9b9c9d30cd81d72b8737ee2baa44b6 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 19 Jun 2026 14:09:49 +0800
Subject: [PATCH] Fix vertical keyboard window focus
---
C1.source/Sources/Aligner/QuickSwitchRootView.swift | 979 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 860 insertions(+), 119 deletions(-)
diff --git a/C1.source/Sources/Aligner/QuickSwitchRootView.swift b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
index 3d16422..f7cbfa2 100644
--- a/C1.source/Sources/Aligner/QuickSwitchRootView.swift
+++ b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
@@ -10,6 +10,8 @@
@MainActor
final class QuickSwitchRootView: NSView {
+ private static let appShelfIndexSymbols = Array("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ").map(String.init)
+
private let backdropBlurView = NSVisualEffectView()
private let layerHostView = NSView()
private let backgroundLayer = CAGradientLayer()
@@ -24,9 +26,8 @@
private lazy var closeConfirmationLayers = makeCloseConfirmationLayers()
private let closeFeedbackLayer = CALayer()
private let closeFeedbackTextLayer = CATextLayer()
- private let settingsButtonLayer = CALayer()
- private let settingsButtonIconLayer = CALayer()
- private let settingsButtonFallbackTextLayer = CATextLayer()
+ private let viewModeToggleButtonLayer = CALayer()
+ private let viewModeToggleIconLayer = CALayer()
private let appIconProvider: any AppIconProviderProtocol = WorkspaceAppIconProvider()
private let skeletonThumbnailProvider = NativeSkeletonThumbnailProvider(size: NSSize(width: 160, height: 96))
private var screenshotSourcesByWindowID: [UInt32: ScreenshotResolutionSource] = [:]
@@ -52,7 +53,8 @@
private var closeConfirmationRequired = true
private var closeFeedback: CloseFeedback?
private var closeFeedbackHideTask: Task<Void, Never>?
- private var isSettingsButtonHovered = false
+ private var isViewModeToggleButtonHovered = false
+ private var suppressViewModeToggleHoverPreview = false
private var hoverTarget: HoverTarget = .none
private var hoverTargetSource: HoverTargetSource = .event
private var hoveredSpaceLaneID: UInt64?
@@ -67,8 +69,15 @@
private var horizontalMasonryScrollOffset: CGFloat = 0
private var currentSelection: QuickSwitchSelection?
private var columnSelectionHistory: [Int: Int] = [:]
+ private var keyboardFocusedAppGroupIndex: Int?
+ private var keyboardFocusedWindowID: UInt32?
private var keyboardCommandsApplied: [String] = []
private var lastKeyboardCommand: String?
+ private var lastKeyboardAppIndexCommand: String?
+ private var lastBoundaryBounceAxis: String?
+ private var lastBoundaryBounceDirection: String?
+ private var boundaryBounceCount = 0
+ private var selectionChangedByLastCommand: Bool?
private var tabIgnoredCount = 0
private var lastCommittedSelection: QuickSwitchSelection?
private var lastCommitSource: QuickSwitchCommitSource?
@@ -95,7 +104,7 @@
var onCommitSelection: ((QuickSwitchSelection, QuickSwitchCommitSource) -> Void)?
var onSpaceLaneClick: ((UInt64, Int) -> Void)?
var onBackgroundClick: (() -> Bool)?
- var onOpenSettings: (() -> Void)?
+ var onToggleWaterfallViewMode: (() -> Void)?
var onRequestClose: ((QuickSwitchCloseRequest) -> Void)?
var onCloseConfirmationDisabled: (() -> Void)?
@@ -218,6 +227,7 @@
private enum HoverTargetSource: String {
case event
case debug
+ case keyboard
}
private struct SpaceLaneSegmentLayers {
@@ -241,6 +251,7 @@
let item: QuickSwitchAppShelfItemViewModel
let containerLayer: CALayer
let backgroundLayer: CALayer
+ let indexLayer: CATextLayer
let iconLayer: CALayer
let labelLayer: CATextLayer
let badgeLayer: CATextLayer
@@ -256,6 +267,7 @@
private struct WaterfallColumnLayers {
let column: QuickSwitchWaterfallColumnViewModel
let containerLayer: CALayer
+ let cardsClipLayer: CALayer
let headerLayer: CALayer
let appNameLayer: CATextLayer
let countLayer: CATextLayer
@@ -299,6 +311,10 @@
static let normalGap: CGFloat = 16
static let minGap: CGFloat = 8
static let maxRows = 2
+ static let indexFontSize: CGFloat = 16
+ static let compressedIndexFontSize: CGFloat = 14
+ static let indexWidth: CGFloat = 18
+ static let indexHeight: CGFloat = 24
}
private enum RootLayoutMetrics {
@@ -307,6 +323,24 @@
static let shelfGap: CGFloat = 16
static let waterfallTopGap: CGFloat = 14
static let bottomMargin: CGFloat = 34
+ }
+
+ private enum ViewModeToggleMetrics {
+ static let hitSize: CGFloat = 34
+ static let visualSize: CGFloat = 30
+ static let cornerRadius: CGFloat = 9
+ static let iconInset: CGFloat = 7
+ static let glyphLineWidth: CGFloat = 1.65
+ static let glyphCornerRadius: CGFloat = 2.1
+ static let selectedShadowRadius: CGFloat = 10
+ static let idleShadowRadius: CGFloat = 5
+ }
+
+ private enum ViewModeToggleVisualState: String {
+ case horizontalAvailable = "H1"
+ case horizontalSelected = "H2"
+ case verticalAvailable = "Z1"
+ case verticalSelected = "Z2"
}
private enum WaterfallMetrics {
@@ -323,6 +357,8 @@
static let cardGap: CGFloat = 12
static let revealPadding: CGFloat = 24
static let horizontalRevealPadding: CGFloat = 0
+ static let selectedCardScale: CGFloat = 1.015
+ static let selectedCardScaleOverflow: CGFloat = cardHeight * (selectedCardScale - 1) / 2
}
private enum HorizontalMasonryMetrics {
@@ -424,6 +460,9 @@
case TriggerKeyCode.tab:
performKeyboardCommand("tab")
default:
+ if handleAppShelfIndexKey(event) {
+ return
+ }
super.keyDown(with: event)
}
}
@@ -485,12 +524,16 @@
override func mouseMoved(with event: NSEvent) {
guard debugHoveredAppGroupIndex == nil else { return }
- let settingsHovered = settingsButtonContains(windowLocation: event.locationInWindow)
- if isSettingsButtonHovered != settingsHovered {
- isSettingsButtonHovered = settingsHovered
+ let toggleHovered = viewModeToggleButtonContains(windowLocation: event.locationInWindow)
+ if !toggleHovered {
+ suppressViewModeToggleHoverPreview = false
+ }
+ let shouldShowToggleHoverPreview = toggleHovered && !suppressViewModeToggleHoverPreview
+ if isViewModeToggleButtonHovered != shouldShowToggleHoverPreview {
+ isViewModeToggleButtonHovered = shouldShowToggleHoverPreview
needsLayout = true
}
- if settingsHovered {
+ if toggleHovered {
hoveredCloseTarget = nil
setHoverTarget(.none)
return
@@ -506,7 +549,8 @@
override func mouseExited(with event: NSEvent) {
guard debugHoveredAppGroupIndex == nil else { return }
- isSettingsButtonHovered = false
+ isViewModeToggleButtonHovered = false
+ suppressViewModeToggleHoverPreview = false
hoveredCloseTarget = nil
setHoverTarget(.none)
}
@@ -525,8 +569,8 @@
return
}
- if settingsButtonContains(windowLocation: event.locationInWindow) {
- clickSettingsButton(source: "mouse")
+ if viewModeToggleButtonContains(windowLocation: event.locationInWindow) {
+ clickViewModeToggleButton(source: "mouse")
return
}
@@ -699,7 +743,8 @@
if case .realScreenshot = resolution.source {
let isSelected = card.item.window.id == effectiveSelection?.windowID
let isHovered = card.item.window.id == hoveredWindowID
- card.shineLayer.opacity = shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) ? 1 : 0
+ let isKeyboardFocused = card.item.window.id == keyboardFocusedWindowID
+ card.shineLayer.opacity = (shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) || isKeyboardFocused) ? 1 : 0
}
needsLayout = true
}
@@ -728,11 +773,38 @@
apply(viewModel: viewModel, preservingInteractionState: true, animatedProjection: true)
}
+ func hoverNextAppGroupIndex(cycleForward: Bool = true) -> Bool {
+ guard !appShelfItems.isEmpty else {
+ return false
+ }
+
+ let orderedIndexes = appShelfItems.map(\.item.appGroupIndex)
+ let sortedIndexes = orderedIndexes
+
+ var currentIndexPosition: Int?
+ if let currentHovered = effectiveHoveredAppGroupIndex {
+ currentIndexPosition = sortedIndexes.firstIndex(of: currentHovered)
+ }
+
+ let nextPosition = currentIndexPosition.map { current in
+ if cycleForward {
+ (current + 1) % sortedIndexes.count
+ } else {
+ (current - 1 + sortedIndexes.count) % sortedIndexes.count
+ }
+ } ?? 0
+
+ let nextAppGroupIndex = sortedIndexes[nextPosition]
+ hoverAppGroup(nextAppGroupIndex)
+ return true
+ }
+
private func apply(
viewModel: QuickSwitchViewModel?,
preservingInteractionState: Bool,
animatedProjection: Bool
) {
+ let preservedWindowThumbnails = preservingInteractionState ? cachedThumbnailsByWindowID() : [:]
let transitionSnapshot = animatedProjection ? captureProjectionTransitionSnapshot() : nil
if !animatedProjection {
resetProjectionTransitionReport()
@@ -743,6 +815,16 @@
currentSelection = validSelection(currentSelection, in: viewModel) ?? viewModel?.initialSelection
columnSelectionHistory = columnSelectionHistory.filter { appGroupIndex, _ in
viewModel?.waterfallColumns.contains { $0.appGroupIndex == appGroupIndex } == true
+ }
+ if let keyboardFocusedAppGroupIndex,
+ viewModel?.waterfallColumns.contains(where: { $0.appGroupIndex == keyboardFocusedAppGroupIndex }) != true {
+ self.keyboardFocusedAppGroupIndex = nil
+ }
+ if let keyboardFocusedWindowID,
+ viewModel?.waterfallColumns.contains(where: { column in
+ column.windows.contains { $0.window.id == keyboardFocusedWindowID }
+ }) != true {
+ self.keyboardFocusedWindowID = nil
}
if let currentSelection {
columnSelectionHistory[currentSelection.appGroupIndex] = currentSelection.windowIndex
@@ -758,8 +840,15 @@
screenshotSkippedReasonsByWindowID = [:]
currentSelection = viewModel?.initialSelection
columnSelectionHistory = [:]
+ keyboardFocusedAppGroupIndex = nil
+ keyboardFocusedWindowID = nil
keyboardCommandsApplied = []
lastKeyboardCommand = nil
+ lastKeyboardAppIndexCommand = nil
+ lastBoundaryBounceAxis = nil
+ lastBoundaryBounceDirection = nil
+ boundaryBounceCount = 0
+ selectionChangedByLastCommand = nil
tabIgnoredCount = 0
lastCommittedSelection = nil
lastCommitSource = nil
@@ -793,12 +882,35 @@
rebuildSpaceLaneSegments()
rebuildAppShelfItems()
rebuildWaterfallColumns()
+
+ if preservingInteractionState {
+ restoreThumbnailsFromCache(preservedWindowThumbnails)
+ }
+
needsLayout = true
ensureCurrentSelectionVisible(horizontalIntent: .alignWithAppShelf(animated: false))
needsLayout = true
if animatedProjection, let transitionSnapshot {
layoutSubtreeIfNeeded()
applyProjectionTransitionAnimations(from: transitionSnapshot)
+ }
+ }
+
+ private func cachedThumbnailsByWindowID() -> [UInt32: Any] {
+ var snapshots: [UInt32: Any] = [:]
+
+ for card in waterfallCardsByWindowID().values {
+ snapshots[card.item.window.id] = card.thumbnailLayer.contents
+ }
+
+ return snapshots
+ }
+
+ private func restoreThumbnailsFromCache(_ cachedThumbnails: [UInt32: Any]) {
+ for card in waterfallCardsByWindowID().values {
+ if let thumbnail = cachedThumbnails[card.item.window.id] {
+ card.thumbnailLayer.contents = thumbnail
+ }
}
}
@@ -1081,9 +1193,20 @@
"activeSpaceFocusID": activeSpaceFocusID ?? NSNull(),
"spaceFilterLockedSpaceID": currentViewModel?.lockedSpaceID ?? NSNull(),
"spaceFilterActive": currentViewModel?.lockedSpaceID != nil,
- "settingsButtonVisible": !settingsButtonLayer.isHidden,
- "settingsButtonHovered": isSettingsButtonHovered,
- "settingsButtonFrame": dictionary(from: settingsButtonLayer.frame),
+ "viewModeToggleButtonVisible": !viewModeToggleButtonLayer.isHidden,
+ "viewModeToggleButtonHovered": isViewModeToggleButtonHovered,
+ "viewModeToggleHoverPreviewSuppressed": suppressViewModeToggleHoverPreview,
+ "viewModeToggleButtonFrame": dictionary(from: viewModeToggleButtonLayer.frame),
+ "viewModeToggleHitSize": Double(ViewModeToggleMetrics.hitSize),
+ "viewModeToggleVisualSize": Double(ViewModeToggleMetrics.visualSize),
+ "viewModeToggleCurrentMode": waterfallViewMode.rawValue,
+ "viewModeToggleTargetMode": nextWaterfallViewMode.rawValue,
+ "viewModeToggleIconKind": viewModeToggleIconKind,
+ "viewModeToggleVisualState": viewModeToggleVisualState.rawValue,
+ "viewModeToggleStandardBlueColor": colorDictionary(from: viewModeToggleBlueColor.cgColor),
+ "viewModeToggleGlyphLineWidth": Double(ViewModeToggleMetrics.glyphLineWidth),
+ "viewModeToggleAccessibilityLabel": viewModeToggleAccessibilityLabel,
+ "settingsButtonVisible": false,
"spaceFocusAppGroupIndexes": spaceFocusedAppGroupIndexes(),
"appHoverAssociatedSpaceIDs": appHoverAssociatedSpaceIDs.sorted(),
"appHoverAssociatedSpaceLabels": appHoverAssociatedSpaceLabels,
@@ -1144,8 +1267,15 @@
"selectedAppGroupIndex": effectiveSelection?.appGroupIndex ?? NSNull(),
"selectedWindowIndex": effectiveSelection?.windowIndex ?? NSNull(),
"selectedWindowID": effectiveSelection?.windowID ?? NSNull(),
+ "keyboardFocusedAppGroupIndex": keyboardFocusedAppGroupIndex ?? NSNull(),
+ "keyboardFocusedWindowID": keyboardFocusedWindowID ?? NSNull(),
"keyboardCommandsApplied": keyboardCommandsApplied,
"lastKeyboardCommand": lastKeyboardCommand ?? NSNull(),
+ "lastKeyboardAppIndexCommand": lastKeyboardAppIndexCommand ?? NSNull(),
+ "lastBoundaryBounceAxis": lastBoundaryBounceAxis ?? NSNull(),
+ "lastBoundaryBounceDirection": lastBoundaryBounceDirection ?? NSNull(),
+ "boundaryBounceCount": boundaryBounceCount,
+ "selectionChangedByLastCommand": selectionChangedByLastCommand ?? NSNull(),
"tabIgnoredCount": tabIgnoredCount,
"lastCommittedAppGroupIndex": lastCommittedSelection?.appGroupIndex ?? NSNull(),
"lastCommittedWindowIndex": lastCommittedSelection?.windowIndex ?? NSNull(),
@@ -1218,21 +1348,47 @@
.lowercased()
guard !command.isEmpty else { return }
+ if let indexSymbol = appShelfIndexSymbol(fromKeyboardCommand: command) {
+ let recordedCommand = "app:\(indexSymbol)"
+ recordKeyboardCommand(recordedCommand)
+ if !focusAppShelfItemForKeyboard(indexSymbol: indexSymbol, commandLabel: recordedCommand) {
+ selectionChangedByLastCommand = false
+ }
+ return
+ }
+
switch command {
case "left":
recordKeyboardCommand("left")
- moveSelection(.left)
+ if isHorizontalMasonryMode {
+ moveSelection(.left)
+ } else if !moveKeyboardAppFocus(cycleForward: false) {
+ selectionChangedByLastCommand = false
+ }
case "right":
recordKeyboardCommand("right")
- moveSelection(.right)
+ if isHorizontalMasonryMode {
+ moveSelection(.right)
+ } else if !moveKeyboardAppFocus(cycleForward: true) {
+ selectionChangedByLastCommand = false
+ }
case "up":
recordKeyboardCommand("up")
- moveSelection(.up)
+ if isHorizontalMasonryMode {
+ moveSelection(.up)
+ } else {
+ moveVerticalSelectionWithinFocusedColumn(.up)
+ }
case "down":
recordKeyboardCommand("down")
- moveSelection(.down)
+ if isHorizontalMasonryMode {
+ moveSelection(.down)
+ } else {
+ moveVerticalSelectionWithinFocusedColumn(.down)
+ }
case "enter", "return", "commit":
recordKeyboardCommand("enter")
+ selectionChangedByLastCommand = false
commitCurrentSelection()
case "tab":
if isHorizontalMasonryMode {
@@ -1241,15 +1397,243 @@
} else {
tabIgnoredCount += 1
recordKeyboardCommand("tabIgnored")
+ selectionChangedByLastCommand = false
}
default:
recordKeyboardCommand("unknown:\(command)")
+ selectionChangedByLastCommand = false
}
}
private func recordKeyboardCommand(_ command: String) {
lastKeyboardCommand = command
keyboardCommandsApplied.append(command)
+ }
+
+ 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,
+ let symbol = appShelfIndexSymbol(fromKeyboardCommand: characters)
+ else {
+ return false
+ }
+
+ performKeyboardCommand(symbol)
+ return true
+ }
+
+ private func appShelfIndexSymbol(fromKeyboardCommand command: String) -> String? {
+ var candidate = command.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
+ for prefix in ["APP:", "APP-", "INDEX:", "INDEX-"] where candidate.hasPrefix(prefix) {
+ candidate.removeFirst(prefix.count)
+ break
+ }
+ guard candidate.count == 1,
+ Self.appShelfIndexSymbols.contains(candidate)
+ else {
+ return nil
+ }
+ return candidate
+ }
+
+ private func focusAppShelfItemForKeyboard(indexSymbol: String, commandLabel: String) -> Bool {
+ guard let ordinal = Self.appShelfIndexSymbols.firstIndex(of: indexSymbol),
+ ordinal < appShelfItems.count
+ else {
+ return false
+ }
+
+ return focusAppShelfItemForKeyboard(
+ appGroupIndex: appShelfItems[ordinal].item.appGroupIndex,
+ appIndexCommand: commandLabel
+ )
+ }
+
+ @discardableResult
+ private func focusAppShelfItemForKeyboard(
+ appGroupIndex: Int,
+ appIndexCommand: String? = nil
+ ) -> Bool {
+ guard appShelfItems.contains(where: { $0.item.appGroupIndex == appGroupIndex }),
+ waterfallColumns.contains(where: { $0.column.appGroupIndex == appGroupIndex })
+ else {
+ return false
+ }
+
+ keyboardFocusedAppGroupIndex = appGroupIndex
+ keyboardFocusedWindowID = nil
+ lastKeyboardAppIndexCommand = appIndexCommand
+ selectionChangedByLastCommand = false
+ clearKeyboardBoundaryFeedback()
+ ensureAppShelfItemVisible(appGroupIndex)
+ layoutSubtreeIfNeeded()
+ hoverAppGroup(appGroupIndex, source: .keyboard)
+ needsLayout = true
+ return true
+ }
+
+ @discardableResult
+ private func moveKeyboardAppFocus(cycleForward: Bool) -> Bool {
+ let orderedAppGroupIndexes = appShelfItems.map(\.item.appGroupIndex)
+ guard !orderedAppGroupIndexes.isEmpty else { return false }
+
+ let currentAppGroupIndex = keyboardFocusedAppGroupIndex
+ ?? appHoverTargetAppGroupIndex
+ ?? effectiveSelection?.appGroupIndex
+ let currentPosition = currentAppGroupIndex.flatMap { orderedAppGroupIndexes.firstIndex(of: $0) }
+ let nextPosition = currentPosition.map { current in
+ if cycleForward {
+ return (current + 1) % orderedAppGroupIndexes.count
+ }
+ return (current - 1 + orderedAppGroupIndexes.count) % orderedAppGroupIndexes.count
+ } ?? (cycleForward ? 0 : orderedAppGroupIndexes.count - 1)
+
+ return focusAppShelfItemForKeyboard(appGroupIndex: orderedAppGroupIndexes[nextPosition])
+ }
+
+ private var appHoverTargetAppGroupIndex: Int? {
+ guard case .app(let appGroupIndex) = hoverTarget else { return nil }
+ return appGroupIndex
+ }
+
+ private func moveVerticalSelectionWithinFocusedColumn(_ direction: QuickSwitchKeyboardDirection) {
+ guard direction == .up || direction == .down,
+ let targetAppGroupIndex = verticalKeyboardNavigationAppGroupIndex(),
+ let column = waterfallColumns.first(where: { $0.column.appGroupIndex == targetAppGroupIndex })
+ else {
+ DevelopmentDiagnostics.log("quickSwitch.view.moveVerticalSelection.blocked", [
+ "direction": keyboardDirectionName(direction),
+ "hasFocusedApp": keyboardFocusedAppGroupIndex != nil,
+ "hasSelection": effectiveSelection != nil
+ ])
+ selectionChangedByLastCommand = false
+ return
+ }
+
+ let cards = column.cards.sorted { $0.item.windowIndex < $1.item.windowIndex }
+ guard !cards.isEmpty else {
+ selectionChangedByLastCommand = false
+ return
+ }
+
+ let previousSelection = effectiveSelection
+ let nextSelection: QuickSwitchSelection
+ if let current = previousSelection,
+ current.appGroupIndex == targetAppGroupIndex,
+ let currentPosition = cards.firstIndex(where: { $0.item.window.id == current.windowID }) {
+ let nextPosition = currentPosition + (direction == .down ? 1 : -1)
+ guard cards.indices.contains(nextPosition) else {
+ keyboardFocusedAppGroupIndex = targetAppGroupIndex
+ hoverAppGroup(targetAppGroupIndex, source: .keyboard)
+ triggerKeyboardBoundaryFeedback(appGroupIndex: targetAppGroupIndex, direction: direction)
+ DevelopmentDiagnostics.log("quickSwitch.view.moveVerticalSelection.boundary", [
+ "direction": keyboardDirectionName(direction),
+ "appGroupIndex": targetAppGroupIndex,
+ "windowIndex": current.windowIndex
+ ])
+ needsLayout = true
+ return
+ }
+ nextSelection = selectionForCard(cards[nextPosition])
+ } else {
+ let rememberedWindowIndex = columnSelectionHistory[targetAppGroupIndex]
+ let rememberedCard = rememberedWindowIndex.flatMap { windowIndex in
+ cards.first { $0.item.windowIndex == windowIndex }
+ }
+ nextSelection = selectionForCard(rememberedCard ?? cards[0])
+ }
+
+ keyboardFocusedAppGroupIndex = targetAppGroupIndex
+ currentSelection = nextSelection
+ keyboardFocusedWindowID = nextSelection.windowID
+ columnSelectionHistory[nextSelection.appGroupIndex] = nextSelection.windowIndex
+ selectionChangedByLastCommand = previousSelection != nextSelection
+ clearKeyboardBoundaryFeedback()
+ hoverAppGroup(targetAppGroupIndex, source: .keyboard)
+ ensureCurrentSelectionVisible(horizontalIntent: .alignWithAppShelf(animated: true))
+ DevelopmentDiagnostics.log("quickSwitch.view.moveVerticalSelection", [
+ "direction": keyboardDirectionName(direction),
+ "appGroupIndex": nextSelection.appGroupIndex,
+ "windowIndex": nextSelection.windowIndex,
+ "windowID": nextSelection.windowID
+ ])
+ needsLayout = true
+ }
+
+ private func verticalKeyboardNavigationAppGroupIndex() -> Int? {
+ if let keyboardFocusedAppGroupIndex,
+ waterfallColumns.contains(where: { $0.column.appGroupIndex == keyboardFocusedAppGroupIndex }) {
+ return keyboardFocusedAppGroupIndex
+ }
+ if let appHoverTargetAppGroupIndex,
+ waterfallColumns.contains(where: { $0.column.appGroupIndex == appHoverTargetAppGroupIndex }) {
+ return appHoverTargetAppGroupIndex
+ }
+ if let appGroupIndex = effectiveSelection?.appGroupIndex,
+ waterfallColumns.contains(where: { $0.column.appGroupIndex == appGroupIndex }) {
+ return appGroupIndex
+ }
+ return waterfallColumns.first?.column.appGroupIndex
+ }
+
+ private func clearKeyboardBoundaryFeedback() {
+ lastBoundaryBounceAxis = nil
+ lastBoundaryBounceDirection = nil
+ }
+
+ private func triggerKeyboardBoundaryFeedback(
+ appGroupIndex: Int,
+ direction: QuickSwitchKeyboardDirection
+ ) {
+ selectionChangedByLastCommand = false
+ lastBoundaryBounceAxis = "vertical"
+ lastBoundaryBounceDirection = keyboardDirectionName(direction)
+ boundaryBounceCount += 1
+
+ layoutSubtreeIfNeeded()
+ guard let column = waterfallColumns.first(where: { $0.column.appGroupIndex == appGroupIndex }) else { return }
+
+ let animationKey = "keyboardBoundaryBounce"
+ column.containerLayer.removeAnimation(forKey: animationKey)
+ if NSWorkspace.shared.accessibilityDisplayShouldReduceMotion {
+ let pulse = CABasicAnimation(keyPath: "opacity")
+ pulse.fromValue = 1
+ pulse.toValue = 0.9
+ pulse.duration = 0.12
+ pulse.autoreverses = true
+ pulse.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+ column.containerLayer.add(pulse, forKey: animationKey)
+ return
+ }
+
+ let currentY = column.containerLayer.presentation()?.position.y
+ ?? column.containerLayer.position.y
+ let delta: CGFloat = direction == .up ? 5 : -5
+ let bounce = CAKeyframeAnimation(keyPath: "position.y")
+ bounce.values = [currentY, currentY + delta, currentY]
+ bounce.keyTimes = [0, 0.38, 1]
+ bounce.timingFunctions = [
+ CAMediaTimingFunction(name: .easeOut),
+ CAMediaTimingFunction(name: .easeInEaseOut)
+ ]
+ bounce.duration = 0.23
+ bounce.isRemovedOnCompletion = true
+ column.containerLayer.add(bounce, forKey: animationKey)
+ }
+
+ private func keyboardDirectionName(_ direction: QuickSwitchKeyboardDirection) -> String {
+ switch direction {
+ case .left:
+ return "left"
+ case .right:
+ return "right"
+ case .up:
+ return "up"
+ case .down:
+ return "down"
+ }
}
private func performMouseCommand(_ rawCommand: String) {
@@ -1326,9 +1710,15 @@
case "click-background":
recordMouseCommand("click-background")
_ = onBackgroundClick?()
- case "click-settings":
- recordMouseCommand("click-settings")
- clickSettingsButton(source: "debug")
+ case "hover-view-toggle":
+ recordMouseCommand("hover-view-toggle")
+ suppressViewModeToggleHoverPreview = false
+ isViewModeToggleButtonHovered = true
+ hoveredCloseTarget = nil
+ setHoverTarget(.none, source: .debug)
+ case "click-view-toggle", "click-settings":
+ recordMouseCommand("click-view-toggle")
+ clickViewModeToggleButton(source: "debug")
case "hover-card" where parts.count == 3:
guard let appGroupIndex = Int(parts[1]), let windowIndex = Int(parts[2]) else {
recordMouseCommand("invalid:\(command)")
@@ -1345,6 +1735,15 @@
}
recordMouseCommand("click-card:\(appGroupIndex):\(windowIndex)")
if let card = waterfallCard(appGroupIndex: appGroupIndex, windowIndex: windowIndex) {
+ clickWindowCard(card)
+ }
+ case "click-card-id" where parts.count == 2:
+ guard let windowID = UInt32(parts[1]) else {
+ recordMouseCommand("invalid:\(command)")
+ return
+ }
+ recordMouseCommand("click-card-id:\(windowID)")
+ if let card = waterfallCard(windowID: windowID) {
clickWindowCard(card)
}
case "hover-card-close" where parts.count == 3:
@@ -1387,13 +1786,13 @@
return command.hasPrefix("hover-")
}
- private func hoverAppGroup(_ appGroupIndex: Int) {
+ private func hoverAppGroup(_ appGroupIndex: Int, source: HoverTargetSource = .debug) {
updateHoverState(
appGroupIndex: appGroupIndex,
windowID: nil,
spaceID: nil,
alignsWaterfallWithAppShelf: true,
- source: .debug
+ source: source
)
}
@@ -1674,8 +2073,11 @@
}
columnSelectionHistory[current.appGroupIndex] = current.windowIndex
+ let previousSelection = effectiveSelection
currentSelection = next
columnSelectionHistory[next.appGroupIndex] = next.windowIndex
+ selectionChangedByLastCommand = previousSelection != next
+ clearKeyboardBoundaryFeedback()
ensureCurrentSelectionVisible(horizontalIntent: .alignWithAppShelf(animated: true))
DevelopmentDiagnostics.log("quickSwitch.view.moveSelection", [
"direction": String(describing: direction),
@@ -1698,8 +2100,11 @@
}
columnSelectionHistory[current.appGroupIndex] = current.windowIndex
+ let previousSelection = effectiveSelection
currentSelection = next
columnSelectionHistory[next.appGroupIndex] = next.windowIndex
+ selectionChangedByLastCommand = previousSelection != next
+ clearKeyboardBoundaryFeedback()
ensureCurrentSelectionVisible(horizontalIntent: .alignWithAppShelf(animated: true))
DevelopmentDiagnostics.log("quickSwitch.view.moveHorizontalMasonrySelection", [
"direction": String(describing: direction),
@@ -2272,25 +2677,15 @@
closeFeedbackLayer.addSublayer(closeFeedbackTextLayer)
glassLayer.addSublayer(closeFeedbackLayer)
- settingsButtonLayer.cornerRadius = 10
- settingsButtonLayer.masksToBounds = false
- settingsButtonLayer.borderWidth = 1
- settingsButtonLayer.shadowColor = NSColor.black.cgColor
- settingsButtonLayer.shadowOffset = CGSize(width: 0, height: -2)
- settingsButtonLayer.zPosition = 170
- settingsButtonIconLayer.contentsGravity = .resizeAspect
- settingsButtonIconLayer.contentsScale = backingScaleFactor
- settingsButtonIconLayer.contents = settingsIconImage()
- settingsButtonFallbackTextLayer.contentsScale = backingScaleFactor
- settingsButtonFallbackTextLayer.string = "⚙"
- settingsButtonFallbackTextLayer.font = NSFont.systemFont(ofSize: 18, weight: .regular)
- settingsButtonFallbackTextLayer.fontSize = 18
- settingsButtonFallbackTextLayer.alignmentMode = .center
- settingsButtonFallbackTextLayer.foregroundColor = NSColor.secondaryLabelColor.cgColor
- settingsButtonFallbackTextLayer.isHidden = settingsButtonIconLayer.contents != nil
- settingsButtonLayer.addSublayer(settingsButtonIconLayer)
- settingsButtonLayer.addSublayer(settingsButtonFallbackTextLayer)
- glassLayer.addSublayer(settingsButtonLayer)
+ viewModeToggleButtonLayer.cornerRadius = 10
+ viewModeToggleButtonLayer.masksToBounds = false
+ viewModeToggleButtonLayer.borderWidth = 1
+ viewModeToggleButtonLayer.shadowColor = NSColor.black.cgColor
+ viewModeToggleButtonLayer.shadowOffset = CGSize(width: 0, height: -2)
+ viewModeToggleButtonLayer.zPosition = 170
+ viewModeToggleIconLayer.contentsScale = backingScaleFactor
+ viewModeToggleButtonLayer.addSublayer(viewModeToggleIconLayer)
+ glassLayer.addSublayer(viewModeToggleButtonLayer)
}
private func rebuildAppShelfItems() {
@@ -2298,7 +2693,7 @@
item.containerLayer.removeFromSuperlayer()
}
- appShelfItems = (currentViewModel?.appShelf ?? []).map { item in
+ appShelfItems = (currentViewModel?.appShelf ?? []).enumerated().map { ordinal, item in
let container = CALayer()
container.name = item.app.name
@@ -2314,6 +2709,18 @@
icon.contents = appIconProvider.icon(for: item.app)
icon.cornerRadius = 12
icon.masksToBounds = false
+
+ let indexLabel = makeTextLayer(
+ string: appShelfIndexText(forOrdinal: ordinal),
+ fontSize: AppShelfMetrics.indexFontSize,
+ weight: .regular,
+ color: appShelfIndexColor,
+ alignment: .center
+ )
+ indexLabel.font = appShelfIndexFont(size: AppShelfMetrics.indexFontSize)
+ indexLabel.fontSize = AppShelfMetrics.indexFontSize
+ indexLabel.truncationMode = .end
+ indexLabel.zPosition = 14
let label = makeTextLayer(
string: item.app.name,
@@ -2339,6 +2746,7 @@
let closeButton = makeCloseButtonLayers()
container.addSublayer(background)
+ container.addSublayer(indexLabel)
container.addSublayer(icon)
container.addSublayer(label)
container.addSublayer(badge)
@@ -2349,6 +2757,7 @@
item: item,
containerLayer: container,
backgroundLayer: background,
+ indexLayer: indexLabel,
iconLayer: icon,
labelLayer: label,
badgeLayer: badge,
@@ -2373,8 +2782,13 @@
container.borderColor = NSColor.separatorColor.withAlphaComponent(0.34).cgColor
container.borderWidth = 1
+ let cardsClip = CALayer()
+ cardsClip.masksToBounds = true
+ cardsClip.backgroundColor = NSColor.clear.cgColor
+
let header = CALayer()
header.backgroundColor = NSColor.controlBackgroundColor.withAlphaComponent(0.68).cgColor
+ header.zPosition = 40
let appName = makeTextLayer(
string: column.app.name,
@@ -2391,6 +2805,10 @@
alignment: .right
)
+ appName.zPosition = 42
+ count.zPosition = 42
+
+ container.addSublayer(cardsClip)
container.addSublayer(header)
container.addSublayer(appName)
container.addSublayer(count)
@@ -2457,7 +2875,7 @@
card.addSublayer(state)
card.addSublayer(shine)
card.addSublayer(closeButton.containerLayer)
- container.addSublayer(card)
+ cardsClip.addSublayer(card)
return WaterfallCardLayers(
item: window,
@@ -2478,6 +2896,7 @@
return WaterfallColumnLayers(
column: column,
containerLayer: container,
+ cardsClipLayer: cardsClip,
headerLayer: header,
appNameLayer: appName,
countLayer: count,
@@ -2641,13 +3060,13 @@
layoutWaterfallColumns()
layoutCloseConfirmation()
layoutCloseFeedback()
- layoutSettingsButton()
+ layoutViewModeToggleButton()
CATransaction.commit()
}
- private func layoutSettingsButton() {
- let size: CGFloat = 34
+ private func layoutViewModeToggleButton() {
+ let size = ViewModeToggleMetrics.visualSize
let topMargin = topSafeAreaInset + RootLayoutMetrics.topContentMargin
let x = max(
RootLayoutMetrics.horizontalMargin,
@@ -2657,24 +3076,144 @@
RootLayoutMetrics.bottomMargin,
glassLayer.bounds.height - topMargin - size
)
- settingsButtonLayer.frame = CGRect(x: x, y: y, width: size, height: size)
- settingsButtonLayer.backgroundColor = NSColor.windowBackgroundColor
- .withAlphaComponent(isSettingsButtonHovered ? 0.78 : 0.54)
- .cgColor
- settingsButtonLayer.borderColor = NSColor.separatorColor
- .withAlphaComponent(isSettingsButtonHovered ? 0.42 : 0.26)
- .cgColor
- settingsButtonLayer.shadowOpacity = isSettingsButtonHovered ? 0.14 : 0.08
- settingsButtonLayer.shadowRadius = isSettingsButtonHovered ? 9 : 6
- settingsButtonIconLayer.contentsScale = backingScaleFactor
- settingsButtonFallbackTextLayer.contentsScale = backingScaleFactor
- let iconInset: CGFloat = 8
- settingsButtonIconLayer.frame = settingsButtonLayer.bounds.insetBy(dx: iconInset, dy: iconInset)
- settingsButtonFallbackTextLayer.frame = settingsButtonLayer.bounds.insetBy(dx: 0, dy: 6)
- settingsButtonFallbackTextLayer.foregroundColor = (isSettingsButtonHovered
- ? NSColor.labelColor
- : NSColor.secondaryLabelColor
+ viewModeToggleButtonLayer.frame = CGRect(x: x, y: y, width: size, height: size)
+ viewModeToggleButtonLayer.cornerRadius = ViewModeToggleMetrics.cornerRadius
+ let visualState = viewModeToggleVisualState
+ let isSelectedState = viewModeToggleVisualStateIsSelected(visualState)
+ viewModeToggleButtonLayer.backgroundColor = (isSelectedState
+ ? viewModeToggleBlueColor
+ : NSColor.windowBackgroundColor.withAlphaComponent(isViewModeToggleButtonHovered ? 0.76 : 0.58)
).cgColor
+ viewModeToggleButtonLayer.borderColor = (isSelectedState
+ ? viewModeToggleBlueColor.withAlphaComponent(0.96)
+ : viewModeToggleBlueColor.withAlphaComponent(isViewModeToggleButtonHovered ? 0.72 : 0.34)
+ ).cgColor
+ viewModeToggleButtonLayer.shadowOpacity = isSelectedState ? 0.16 : (isViewModeToggleButtonHovered ? 0.11 : 0.06)
+ viewModeToggleButtonLayer.shadowRadius = isSelectedState
+ ? ViewModeToggleMetrics.selectedShadowRadius
+ : ViewModeToggleMetrics.idleShadowRadius
+ viewModeToggleIconLayer.contentsScale = backingScaleFactor
+ let iconInset = ViewModeToggleMetrics.iconInset
+ viewModeToggleIconLayer.frame = viewModeToggleButtonLayer.bounds.insetBy(dx: iconInset, dy: iconInset)
+ layoutViewModeToggleIcon()
+ }
+
+ private func layoutViewModeToggleIcon() {
+ CATransaction.begin()
+ CATransaction.setDisableActions(true)
+ viewModeToggleIconLayer.sublayers?.forEach { $0.removeFromSuperlayer() }
+
+ let bounds = viewModeToggleIconLayer.bounds
+ guard bounds.width > 0, bounds.height > 0 else {
+ CATransaction.commit()
+ return
+ }
+
+ let visualState = viewModeToggleVisualState
+ let isSelectedState = viewModeToggleVisualStateIsSelected(visualState)
+ let strokeColor = isSelectedState
+ ? NSColor.white.withAlphaComponent(0.98)
+ : viewModeToggleBlueColor.withAlphaComponent(0.96)
+ let fillColor = isSelectedState
+ ? NSColor.white.withAlphaComponent(0.22)
+ : viewModeToggleBlueColor.withAlphaComponent(0.06)
+ let glyphRect = centeredSquare(in: bounds)
+
+ switch visualState {
+ case .verticalAvailable, .verticalSelected:
+ addVerticalColumnsToggleGlyph(
+ in: glyphRect,
+ strokeColor: strokeColor,
+ fillColor: fillColor
+ )
+ case .horizontalAvailable, .horizontalSelected:
+ addHorizontalMasonryToggleGlyph(
+ in: glyphRect,
+ strokeColor: strokeColor,
+ fillColor: fillColor
+ )
+ }
+
+ CATransaction.commit()
+ }
+
+ private func addVerticalColumnsToggleGlyph(
+ in rect: CGRect,
+ strokeColor: NSColor,
+ fillColor: NSColor
+ ) {
+ let columnWidth = rect.width * 0.22
+ let gap = (rect.width - columnWidth * 3) / 2
+ for index in 0..<3 {
+ let x = rect.minX + CGFloat(index) * (columnWidth + gap)
+ let columnRect = CGRect(x: x, y: rect.minY, width: columnWidth, height: rect.height)
+ addViewModeToggleRoundedRect(
+ columnRect,
+ cornerRadius: ViewModeToggleMetrics.glyphCornerRadius,
+ strokeColor: strokeColor,
+ fillColor: fillColor,
+ lineWidth: ViewModeToggleMetrics.glyphLineWidth
+ )
+ }
+ }
+
+ private func addHorizontalMasonryToggleGlyph(
+ in rect: CGRect,
+ strokeColor: NSColor,
+ fillColor: NSColor
+ ) {
+ let cellSize = rect.width * 0.38
+ let gap = rect.width - cellSize * 2
+ for row in 0..<2 {
+ for column in 0..<2 {
+ let cellRect = CGRect(
+ x: rect.minX + CGFloat(column) * (cellSize + gap),
+ y: rect.minY + CGFloat(row) * (cellSize + gap),
+ width: cellSize,
+ height: cellSize
+ )
+ addViewModeToggleRoundedRect(
+ cellRect,
+ cornerRadius: ViewModeToggleMetrics.glyphCornerRadius,
+ strokeColor: strokeColor,
+ fillColor: fillColor,
+ lineWidth: ViewModeToggleMetrics.glyphLineWidth
+ )
+ }
+ }
+ }
+
+ private func addViewModeToggleRoundedRect(
+ _ rect: CGRect,
+ cornerRadius: CGFloat,
+ strokeColor: NSColor,
+ fillColor: NSColor,
+ lineWidth: CGFloat
+ ) {
+ let layer = CAShapeLayer()
+ layer.contentsScale = backingScaleFactor
+ layer.frame = viewModeToggleIconLayer.bounds
+ layer.path = CGPath(
+ roundedRect: rect,
+ cornerWidth: cornerRadius,
+ cornerHeight: cornerRadius,
+ transform: nil
+ )
+ layer.fillColor = fillColor.cgColor
+ layer.strokeColor = strokeColor.cgColor
+ layer.lineWidth = lineWidth
+ layer.lineJoin = .round
+ viewModeToggleIconLayer.addSublayer(layer)
+ }
+
+ private func centeredSquare(in rect: CGRect) -> CGRect {
+ let side = min(rect.width, rect.height)
+ return CGRect(
+ x: rect.midX - side / 2,
+ y: rect.midY - side / 2,
+ width: side,
+ height: side
+ )
}
private var topSafeAreaInset: CGFloat {
@@ -3026,24 +3565,31 @@
spaceLaneSegments.first { $0.space.id == spaceID }
}
- private func settingsButtonContains(windowLocation: CGPoint) -> Bool {
+ private func viewModeToggleButtonContains(windowLocation: CGPoint) -> Bool {
let locationInView = convert(windowLocation, from: nil)
let locationInGlass = CGPoint(
x: locationInView.x - glassLayer.frame.minX,
y: locationInView.y - glassLayer.frame.minY
)
- return settingsButtonLayer.frame.contains(locationInGlass)
+ let hitOutset = (ViewModeToggleMetrics.hitSize - ViewModeToggleMetrics.visualSize) / 2
+ return viewModeToggleButtonLayer.frame
+ .insetBy(dx: -hitOutset, dy: -hitOutset)
+ .contains(locationInGlass)
}
- private func clickSettingsButton(source: String) {
- DevelopmentDiagnostics.log("quickSwitch.view.clickSettings", [
- "source": source
+ private func clickViewModeToggleButton(source: String) {
+ DevelopmentDiagnostics.log("quickSwitch.view.clickWaterfallViewModeToggle", [
+ "source": source,
+ "currentMode": waterfallViewMode.rawValue,
+ "targetMode": nextWaterfallViewMode.rawValue
])
- lastMouseCommand = "click-settings"
- if !mouseCommandsApplied.contains("click-settings") {
- mouseCommandsApplied.append("click-settings")
+ lastMouseCommand = "click-view-toggle"
+ if !mouseCommandsApplied.contains("click-view-toggle") {
+ mouseCommandsApplied.append("click-view-toggle")
}
- onOpenSettings?()
+ isViewModeToggleButtonHovered = false
+ suppressViewModeToggleHoverPreview = true
+ onToggleWaterfallViewMode?()
}
private func appShelfItem(at windowLocation: CGPoint) -> AppShelfItemLayers? {
@@ -3070,7 +3616,14 @@
x: locationInWaterfallContent.x - column.containerLayer.frame.minX,
y: locationInWaterfallContent.y - column.containerLayer.frame.minY
)
- if let card = column.cards.first(where: { $0.containerLayer.frame.contains(locationInColumn) }) {
+ guard column.cardsClipLayer.frame.contains(locationInColumn) else {
+ continue
+ }
+ let locationInCardsClip = CGPoint(
+ x: locationInColumn.x - column.cardsClipLayer.frame.minX,
+ y: locationInColumn.y - column.cardsClipLayer.frame.minY
+ )
+ if let card = column.cards.first(where: { $0.containerLayer.frame.contains(locationInCardsClip) }) {
return card
}
}
@@ -3083,6 +3636,13 @@
.first(where: { $0.column.appGroupIndex == appGroupIndex })?
.cards
.first(where: { $0.item.windowIndex == windowIndex })
+ }
+
+ private func waterfallCard(windowID: UInt32) -> WaterfallCardLayers? {
+ waterfallColumns
+ .lazy
+ .flatMap(\.cards)
+ .first(where: { $0.item.window.id == windowID })
}
private func layoutSpaceLaneSegmentContents(_ segment: SpaceLaneSegmentLayers) {
@@ -3248,6 +3808,13 @@
)
: nil
item.iconLayer.frame = CGRect(x: iconX, y: iconY, width: visualIconSize, height: visualIconSize)
+ layoutAppShelfIndexLayer(
+ item.indexLayer,
+ iconFrame: item.iconLayer.frame,
+ iconSize: visualIconSize,
+ itemBounds: bounds,
+ highlighted: showsSelectedVisual || isHovered
+ )
item.labelLayer.contentsScale = backingScaleFactor
item.labelLayer.frame = CGRect(x: 0, y: 0, width: bounds.width, height: 14)
item.badgeLayer.string = badgeText
@@ -3273,6 +3840,66 @@
)
item.selectedIndicatorLayer.frame = .zero
item.selectedIndicatorLayer.backgroundColor = NSColor.clear.cgColor
+ }
+
+ private var appShelfIndexColor: NSColor {
+ NSColor.labelColor.withAlphaComponent(0.48)
+ }
+
+ private var appShelfIndexHighlightedColor: NSColor {
+ NSColor.labelColor.withAlphaComponent(0.58)
+ }
+
+ private func appShelfIndexFont(size: CGFloat) -> NSFont {
+ for fontName in ["Bradley Hand ITC", "Noteworthy-Light", "Marker Felt", "Snell Roundhand"] {
+ if let font = NSFont(name: fontName, size: size) {
+ return font
+ }
+ }
+
+ return NSFont.monospacedSystemFont(ofSize: size, weight: .regular)
+ }
+
+ private func appShelfIndexText(forOrdinal ordinal: Int) -> String {
+ guard ordinal >= 0 else { return "" }
+ if ordinal < Self.appShelfIndexSymbols.count {
+ return Self.appShelfIndexSymbols[ordinal]
+ }
+
+ let overflowIndex = ordinal - Self.appShelfIndexSymbols.count
+ let prefix = Self.appShelfIndexSymbols[10 + (overflowIndex / 26) % 26]
+ let suffix = Self.appShelfIndexSymbols[10 + overflowIndex % 26]
+ return "\(prefix)\(suffix)"
+ }
+
+ private func layoutAppShelfIndexLayer(
+ _ layer: CATextLayer,
+ iconFrame: CGRect,
+ iconSize: CGFloat,
+ itemBounds: CGRect,
+ highlighted: Bool
+ ) {
+ let fontSize = iconSize <= AppShelfMetrics.minIconSize + 1
+ ? AppShelfMetrics.compressedIndexFontSize
+ : AppShelfMetrics.indexFontSize
+ layer.contentsScale = backingScaleFactor
+ layer.font = appShelfIndexFont(size: fontSize)
+ layer.fontSize = fontSize
+ layer.foregroundColor = (highlighted ? appShelfIndexHighlightedColor : appShelfIndexColor).cgColor
+ layer.opacity = 1
+
+ let indexWidth = AppShelfMetrics.indexWidth
+ let indexHeight = AppShelfMetrics.indexHeight
+ let preferredX = iconFrame.minX - indexWidth - 2
+ let clampedX = max(-7, min(itemBounds.width - indexWidth, preferredX))
+ let preferredY = iconFrame.maxY - indexHeight + 6
+ let clampedY = max(0, min(itemBounds.height - indexHeight, preferredY))
+ layer.frame = CGRect(
+ x: clampedX,
+ y: clampedY,
+ width: indexWidth,
+ height: indexHeight
+ )
}
private func appShelfRows() -> [[AppShelfItemLayers]] {
@@ -3322,6 +3949,14 @@
.cards
.compactMap(\.item.primarySpaceID) ?? []
)
+ }
+
+ private var appIconHoverLinkedAppGroupIndex: Int? {
+ if let debugHoveredAppGroupIndex {
+ return debugHoveredAppGroupIndex
+ }
+ guard case .app(let appGroupIndex) = hoverTarget else { return nil }
+ return appGroupIndex
}
private var appHoverAssociatedSpaceLabels: [String] {
@@ -3467,6 +4102,10 @@
return item.item.windowCount > 1 ? "\(item.item.windowCount)" : ""
}
+ private var waterfallAppHoverHeaderFillColor: NSColor {
+ NSColor.systemGray.withAlphaComponent(0.22)
+ }
+
private var appShelfMaxScrollOffset: CGFloat {
max(0, appShelfContentWidth - shelfLayer.bounds.width)
}
@@ -3547,11 +4186,14 @@
column.containerLayer.shadowOpacity = 0
column.containerLayer.shadowRadius = 0
column.containerLayer.shadowOffset = .zero
+ column.cardsClipLayer.frame = column.containerLayer.bounds
+ column.cardsClipLayer.masksToBounds = false
column.headerLayer.isHidden = true
column.appNameLayer.isHidden = true
column.countLayer.isHidden = true
for card in column.cards {
+ card.containerLayer.transform = CATransform3DIdentity
if let frame = layout.cardFramesByWindowID[card.item.window.id] {
card.containerLayer.frame = frame
} else {
@@ -3685,6 +4327,14 @@
column.countLayer.isHidden = false
let bounds = column.containerLayer.bounds
+ let cardsClipFrame = CGRect(
+ x: 0,
+ y: 0,
+ width: bounds.width,
+ height: max(1, bounds.height - WaterfallMetrics.headerHeight)
+ )
+ column.cardsClipLayer.frame = cardsClipFrame
+ column.cardsClipLayer.masksToBounds = true
let isSpaceFocused = spaceFocusWindowCount(for: column.column.appGroupIndex) > 0
let isHovered = column.column.appGroupIndex == effectiveHoveredAppGroupIndex
column.containerLayer.borderColor = (isSpaceFocused
@@ -3698,9 +4348,11 @@
width: bounds.width,
height: WaterfallMetrics.headerHeight
)
- column.headerLayer.backgroundColor = (isSpaceFocused
- ? NSColor.systemFill.withAlphaComponent(0.10)
- : NSColor.controlBackgroundColor.withAlphaComponent(0.52)
+ column.headerLayer.backgroundColor = (isHovered
+ ? waterfallAppHoverHeaderFillColor
+ : (isSpaceFocused
+ ? NSColor.systemFill.withAlphaComponent(0.10)
+ : NSColor.controlBackgroundColor.withAlphaComponent(0.52))
).cgColor
column.appNameLayer.frame = CGRect(
x: WaterfallMetrics.columnHeaderTextInset,
@@ -3708,16 +4360,14 @@
width: max(1, bounds.width - WaterfallMetrics.columnHeaderTextInset * 2),
height: 16
)
- column.appNameLayer.foregroundColor = (isHovered
- ? spaceLaneOccupiedColor
- : NSColor.labelColor
- ).cgColor
+ column.appNameLayer.foregroundColor = NSColor.labelColor.cgColor
column.countLayer.frame = CGRect(
x: bounds.width - 48,
y: bounds.height - 24,
width: 36,
height: 16
)
+ column.countLayer.foregroundColor = NSColor.secondaryLabelColor.cgColor
let appGroupIndex = column.column.appGroupIndex
let verticalOffset = clampedWaterfallColumnOffset(
@@ -3727,8 +4377,8 @@
waterfallColumnScrollOffsets[appGroupIndex] = verticalOffset
let cardWidth = max(1, bounds.width - WaterfallMetrics.columnHorizontalPadding * 2)
- let firstCardTop = bounds.height
- - WaterfallMetrics.headerHeight
+ let firstCardTop = cardsClipFrame.height
+ - WaterfallMetrics.selectedCardScaleOverflow
- WaterfallMetrics.columnVerticalPadding
+ verticalOffset
@@ -3737,6 +4387,7 @@
let y = firstCardTop
- WaterfallMetrics.cardHeight
- CGFloat(cardIndex) * (WaterfallMetrics.cardHeight + WaterfallMetrics.cardGap)
+ card.containerLayer.transform = CATransform3DIdentity
card.containerLayer.frame = CGRect(
x: WaterfallMetrics.columnHorizontalPadding,
y: y,
@@ -3751,10 +4402,13 @@
let bounds = card.containerLayer.bounds
let isSelected = card.item.window.id == effectiveSelection?.windowID
let isHovered = card.item.window.id == hoveredWindowID
+ let isKeyboardFocused = card.item.window.id == keyboardFocusedWindowID
+ let isAppLinked = isWaterfallCardAppLinked(card)
applyWaterfallCardVisualState(
card,
- selected: shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered),
- hovered: isHovered
+ selected: shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) || isKeyboardFocused,
+ hovered: isHovered,
+ appLinked: isAppLinked
)
let outerInset: CGFloat = 0
@@ -3817,12 +4471,19 @@
)
}
- private func applyWaterfallCardVisualState(_ card: WaterfallCardLayers, selected: Bool, hovered: Bool) {
+ private func applyWaterfallCardVisualState(
+ _ card: WaterfallCardLayers,
+ selected: Bool,
+ hovered: Bool,
+ appLinked: Bool
+ ) {
let isSpaceFocused = isWaterfallCardSpaceFocused(card)
card.containerLayer.backgroundColor = (selected
? NSColor.windowBackgroundColor.withAlphaComponent(0.94)
: 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)
@@ -3831,27 +4492,31 @@
? NSColor.controlAccentColor.withAlphaComponent(0.52)
: hovered
? NSColor.controlAccentColor.withAlphaComponent(0.44)
+ : appLinked
+ ? NSColor.controlAccentColor.withAlphaComponent(0.38)
: isSpaceFocused
? NSColor.controlAccentColor.withAlphaComponent(0.42)
: NSColor.separatorColor.withAlphaComponent(0.28)
).cgColor
- card.containerLayer.borderWidth = (selected || hovered || isSpaceFocused) ? 1.5 : 1
+ 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 : isSpaceFocused ? 0.20 : 0
- card.containerLayer.shadowRadius = selected ? 22 : hovered ? 17 : isSpaceFocused ? 24 : 0
+ card.containerLayer.shadowOpacity = selected ? 0.24 : hovered ? 0.14 : appLinked ? 0.16 : isSpaceFocused ? 0.20 : 0
+ card.containerLayer.shadowRadius = selected ? 22 : hovered ? 17 : appLinked ? 18 : isSpaceFocused ? 24 : 0
card.containerLayer.shadowOffset = selected
? CGSize(width: 0, height: -6)
: hovered
? CGSize(width: 0, height: -2.5)
+ : appLinked
+ ? CGSize(width: 0, height: -3)
: isSpaceFocused
? CGSize(width: 0, height: -5)
: .zero
- card.containerLayer.zPosition = selected ? 20 : hovered ? 10 : isSpaceFocused ? 8 : 0
- let focusedScale: CGFloat = selected ? 1.015 : isSpaceFocused ? 1.012 : 1.008
+ 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)
? CATransform3DMakeScale(focusedScale, focusedScale, 1)
: CATransform3DIdentity
- card.containerLayer.shadowPath = (selected || hovered || isSpaceFocused)
+ card.containerLayer.shadowPath = (selected || hovered || appLinked || isSpaceFocused)
? CGPath(
roundedRect: card.containerLayer.bounds,
cornerWidth: card.containerLayer.cornerRadius,
@@ -3859,7 +4524,9 @@
transform: nil
)
: nil
- card.titleBarLayer.backgroundColor = NSColor.clear.cgColor
+ card.titleBarLayer.backgroundColor = appLinked
+ ? spaceLaneOccupiedColor.withAlphaComponent(0.18).cgColor
+ : NSColor.clear.cgColor
card.titleBarLayer.borderColor = NSColor.clear.cgColor
card.titleBarLayer.borderWidth = 0
card.shineLayer.opacity = selected ? 1 : 0
@@ -4321,11 +4988,18 @@
x: locationInWaterfallContent.x - column.containerLayer.frame.minX,
y: locationInWaterfallContent.y - column.containerLayer.frame.minY
)
- for card in column.cards where card.containerLayer.frame.contains(locationInColumn) {
+ guard column.cardsClipLayer.frame.contains(locationInColumn) else {
+ continue
+ }
+ let locationInCardsClip = CGPoint(
+ x: locationInColumn.x - column.cardsClipLayer.frame.minX,
+ y: locationInColumn.y - column.cardsClipLayer.frame.minY
+ )
+ for card in column.cards where card.containerLayer.frame.contains(locationInCardsClip) {
guard card.closeButton.containerLayer.opacity > 0 else { continue }
let locationInCard = CGPoint(
- x: locationInColumn.x - card.containerLayer.frame.minX,
- y: locationInColumn.y - card.containerLayer.frame.minY
+ x: locationInCardsClip.x - card.containerLayer.frame.minX,
+ y: locationInCardsClip.y - card.containerLayer.frame.minY
)
if card.closeButton.containerLayer.frame.insetBy(dx: -8, dy: -8).contains(locationInCard) {
return .window(
@@ -4367,11 +5041,13 @@
x: waterfallLayer.frame.minX
+ waterfallContentLayer.frame.minX
+ column.containerLayer.frame.minX
+ + column.cardsClipLayer.frame.minX
+ card.containerLayer.frame.minX
+ card.closeButton.containerLayer.frame.midX,
y: waterfallLayer.frame.minY
+ waterfallContentLayer.frame.minY
+ column.containerLayer.frame.minY
+ + column.cardsClipLayer.frame.minY
+ card.containerLayer.frame.minY
+ card.closeButton.containerLayer.frame.midY
)
@@ -4387,6 +5063,26 @@
private func isWaterfallCardSpaceFocused(_ card: WaterfallCardLayers) -> Bool {
guard let activeSpaceFocusID else { return false }
return card.item.primarySpaceID == activeSpaceFocusID
+ }
+
+ private func isWaterfallCardAppLinked(_ card: WaterfallCardLayers) -> Bool {
+ guard card.item.appGroupIndex == appIconHoverLinkedAppGroupIndex else { return false }
+
+ if isHorizontalMasonryMode {
+ return true
+ }
+
+ return waterfallColumns
+ .first(where: { $0.column.appGroupIndex == card.item.appGroupIndex })?
+ .cards
+ .sorted { lhs, rhs in
+ if lhs.item.windowIndex != rhs.item.windowIndex {
+ return lhs.item.windowIndex < rhs.item.windowIndex
+ }
+ return lhs.item.window.id < rhs.item.window.id
+ }
+ .first?
+ .item.window.id == card.item.window.id
}
private func waterfallColumnWidth() -> CGFloat {
@@ -4406,6 +5102,43 @@
private var isHorizontalMasonryMode: Bool {
waterfallViewMode == .horizontalMasonry
+ }
+
+ 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 viewModeToggleVisualState: ViewModeToggleVisualState {
+ if isHorizontalMasonryMode {
+ return isViewModeToggleButtonHovered ? .verticalAvailable : .horizontalSelected
+ }
+ return isViewModeToggleButtonHovered ? .horizontalAvailable : .verticalSelected
+ }
+
+ private func viewModeToggleVisualStateIsSelected(_ state: ViewModeToggleVisualState) -> Bool {
+ switch state {
+ case .horizontalSelected, .verticalSelected:
+ return true
+ case .horizontalAvailable, .verticalAvailable:
+ return false
+ }
+ }
+
+ private var viewModeToggleIconKind: String {
+ viewModeToggleVisualState.rawValue
+ }
+
+ private var viewModeToggleAccessibilityLabel: String {
+ switch nextWaterfallViewMode {
+ case .verticalColumns:
+ return "切换到纵栏瀑布"
+ case .horizontalMasonry:
+ return "切换到横栏瀑布"
+ }
}
private var waterfallMaxScrollOffset: CGFloat {
@@ -4442,7 +5175,7 @@
)
let contentHeight = CGFloat(column.cards.count) * WaterfallMetrics.cardHeight
+ CGFloat(max(0, column.cards.count - 1)) * WaterfallMetrics.cardGap
- return max(0, contentHeight - visibleHeight)
+ return max(0, contentHeight - visibleHeight + WaterfallMetrics.selectedCardScaleOverflow * 2)
}
private func clampedWaterfallColumnOffset(_ offset: CGFloat, appGroupIndex: Int) -> CGFloat {
@@ -4525,21 +5258,6 @@
shapeLayer.lineCap = .round
shapeLayer.lineJoin = .round
return shapeLayer
- }
-
- private func settingsIconImage() -> CGImage? {
- let names = [
- NSImage.Name("NSPreferencesGeneral"),
- NSImage.Name("NSAdvanced")
- ]
- for name in names {
- guard let image = NSImage(named: name) else { continue }
- var rect = CGRect(origin: .zero, size: image.size)
- if let cgImage = image.cgImage(forProposedRect: &rect, context: nil, hints: nil) {
- return cgImage
- }
- }
- return nil
}
private func makeTextLayer(
@@ -4821,6 +5539,12 @@
"frame": dictionary(from: item.containerLayer.frame),
"visibleFrame": dictionary(from: visibleFrame),
"iconFrame": dictionary(from: item.iconLayer.frame),
+ "indexText": item.indexLayer.string ?? "",
+ "indexFrame": dictionary(from: item.indexLayer.frame),
+ "indexVisible": !item.indexLayer.isHidden && item.indexLayer.opacity > 0,
+ "indexFontSize": Double(item.indexLayer.fontSize),
+ "indexOpacity": Double(item.indexLayer.opacity),
+ "indexColor": colorDictionary(from: item.indexLayer.foregroundColor),
"labelFrame": dictionary(from: item.labelLayer.frame),
"labelTruncationMode": "middle",
"badgeVisible": !item.badgeLayer.isHidden,
@@ -4874,10 +5598,13 @@
let appGroupIndex = column.column.appGroupIndex
let isHovered = appGroupIndex == effectiveHoveredAppGroupIndex
let firstCardFrame = column.cards.first?.containerLayer.frame
- let headerToFirstCardGap = firstCardFrame.map {
+ let visibleFirstCardFrame = firstCardFrame.map {
+ $0.offsetBy(dx: column.cardsClipLayer.frame.minX, dy: column.cardsClipLayer.frame.minY)
+ }
+ let headerToFirstCardGap = visibleFirstCardFrame.map {
column.headerLayer.frame.minY - $0.maxY
}
- let topToFirstCardGap = firstCardFrame.map {
+ let topToFirstCardGap = visibleFirstCardFrame.map {
column.containerLayer.bounds.height - $0.maxY
}
@@ -4894,12 +5621,16 @@
"frame": dictionary(from: column.containerLayer.frame),
"visibleFrame": dictionary(from: visibleFrame),
"headerFrame": dictionary(from: column.headerLayer.frame),
+ "headerBackgroundColor": colorDictionary(from: column.headerLayer.backgroundColor),
+ "cardsClipFrame": dictionary(from: column.cardsClipLayer.frame),
+ "cardsClipMasksToBounds": column.cardsClipLayer.masksToBounds,
"headerToFirstCardGap": headerToFirstCardGap.map(Double.init) ?? NSNull(),
"topToFirstCardGap": topToFirstCardGap.map(Double.init) ?? NSNull(),
"appNameFrame": dictionary(from: column.appNameLayer.frame),
"appNameAlignment": column.appNameLayer.alignmentMode.rawValue,
"appNameColor": colorDictionary(from: column.appNameLayer.foregroundColor),
"countFrame": dictionary(from: column.countLayer.frame),
+ "countColor": colorDictionary(from: column.countLayer.foregroundColor),
"verticalScrollOffset": Double(waterfallColumnScrollOffsets[appGroupIndex] ?? 0),
"maxVerticalScrollOffset": Double(waterfallMaxVerticalScrollOffset(for: appGroupIndex)),
"cards": waterfallCardReports(for: column)
@@ -4957,8 +5688,8 @@
private func waterfallCardReports(for column: WaterfallColumnLayers) -> [[String: Any]] {
column.cards.map { card in
let visibleFrame = card.containerLayer.frame.offsetBy(
- dx: column.containerLayer.frame.minX + waterfallContentLayer.frame.minX,
- dy: column.containerLayer.frame.minY
+ dx: column.containerLayer.frame.minX + column.cardsClipLayer.frame.minX + waterfallContentLayer.frame.minX,
+ dy: column.containerLayer.frame.minY + column.cardsClipLayer.frame.minY
)
let screenshotSource = screenshotSourcesByWindowID[card.item.window.id]
@@ -4976,6 +5707,7 @@
"isFullscreen": card.item.window.isFullscreen,
"identifierSource": "\(card.item.window.identifierSource)",
"isSelected": card.item.window.id == effectiveSelection?.windowID,
+ "isKeyboardFocused": card.item.window.id == keyboardFocusedWindowID,
"visualStates": waterfallCardVisualStates(for: card),
"thumbnailStrategy": thumbnailStrategyString(for: card.item.window),
"screenshotSource": screenshotSourceString(screenshotSource, for: card.item.window),
@@ -4986,6 +5718,7 @@
"shadowRadius": Double(card.containerLayer.shadowRadius),
"thumbnailFrame": dictionary(from: card.thumbnailLayer.frame),
"titleBarFrame": dictionary(from: card.titleBarLayer.frame),
+ "titleBarBackgroundColor": colorDictionary(from: card.titleBarLayer.backgroundColor),
"titleBarBorderWidth": Double(card.titleBarLayer.borderWidth),
"titleFrame": dictionary(from: card.titleLayer.frame),
"metaFrame": dictionary(from: card.metaLayer.frame),
@@ -5093,14 +5826,22 @@
var states: [String] = []
let isSelected = card.item.window.id == effectiveSelection?.windowID
let isHovered = card.item.window.id == hoveredWindowID
- if shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) {
+ let isKeyboardFocused = card.item.window.id == keyboardFocusedWindowID
+ let isAppLinked = isWaterfallCardAppLinked(card)
+ if shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) || isKeyboardFocused {
states.append("selected")
} else if isSelected {
states.append("selectedVisualSuppressed")
}
+ if isKeyboardFocused {
+ states.append("keyboardFocused")
+ }
if isHovered {
states.append("hover")
}
+ if isAppLinked {
+ states.append("appLinked")
+ }
if isWaterfallCardSpaceFocused(card) {
states.append("spaceFocused")
}
--
Gitblit v1.9.3