From ae0f48a9d9543d43b120674f0e58164d7cce95ad Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sun, 14 Jun 2026 21:06:22 +0800
Subject: [PATCH] Refine Quick Switch UI states
---
C1.source/Sources/Aligner/QuickSwitchRootView.swift | 464 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 355 insertions(+), 109 deletions(-)
diff --git a/C1.source/Sources/Aligner/QuickSwitchRootView.swift b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
index 4ea3319..9b47c99 100644
--- a/C1.source/Sources/Aligner/QuickSwitchRootView.swift
+++ b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
@@ -24,9 +24,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 +51,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?
@@ -95,7 +95,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)?
@@ -309,6 +309,24 @@
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 {
static let gap: CGFloat = 16
static let columnWidth: CGFloat = 252
@@ -485,12 +503,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 +528,8 @@
override func mouseExited(with event: NSEvent) {
guard debugHoveredAppGroupIndex == nil else { return }
- isSettingsButtonHovered = false
+ isViewModeToggleButtonHovered = false
+ suppressViewModeToggleHoverPreview = false
hoveredCloseTarget = nil
setHoverTarget(.none)
}
@@ -525,8 +548,8 @@
return
}
- if settingsButtonContains(windowLocation: event.locationInWindow) {
- clickSettingsButton(source: "mouse")
+ if viewModeToggleButtonContains(windowLocation: event.locationInWindow) {
+ clickViewModeToggleButton(source: "mouse")
return
}
@@ -1081,9 +1104,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,
@@ -1326,9 +1360,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 +1385,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:
@@ -2272,25 +2321,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() {
@@ -2641,13 +2680,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 +2696,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 +3185,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? {
@@ -3085,15 +3251,25 @@
.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) {
let bounds = segment.containerLayer.bounds
+ let splitAppNames = splitViewAppNames(for: segment.space)
+ let isSplitView = splitAppNames.count >= 2
segment.labelLayer.frame = CGRect(x: 10, y: bounds.height - 29, width: max(1, bounds.width - 48), height: 20)
segment.countLayer.frame = CGRect(x: bounds.width - 34, y: bounds.height - 29, width: 24, height: 20)
+ segment.countLayer.string = isSplitView ? "" : "\(segment.space.windowCount)"
+ segment.countLayer.isHidden = isSplitView
if segment.space.type == .fullscreen {
let markerFrame = fullscreenMarkerFrame(in: bounds)
- let splitAppNames = splitViewAppNames(for: segment.space)
- segment.appLayer.isHidden = splitAppNames.count >= 2
- if splitAppNames.count >= 2 {
+ segment.appLayer.isHidden = isSplitView
+ if isSplitView {
let labelY = markerFrame.midY - 8.5
let halfWidth = markerFrame.width / 2
for (index, splitAppLayer) in segment.splitAppLayers.enumerated() {
@@ -3128,7 +3304,7 @@
layoutFullscreenMarkerLayer(
fullscreenMarkerLayer,
in: bounds,
- isSplitView: splitViewAppNames(for: segment.space).count >= 2
+ isSplitView: isSplitView
)
}
@@ -3319,6 +3495,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] {
@@ -3695,9 +3879,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
+ ? viewModeToggleBlueColor
+ : (isSpaceFocused
+ ? NSColor.systemFill.withAlphaComponent(0.10)
+ : NSColor.controlBackgroundColor.withAlphaComponent(0.52))
).cgColor
column.appNameLayer.frame = CGRect(
x: WaterfallMetrics.columnHeaderTextInset,
@@ -3705,16 +3891,14 @@
width: max(1, bounds.width - WaterfallMetrics.columnHeaderTextInset * 2),
height: 16
)
- column.appNameLayer.foregroundColor = (isHovered
- ? spaceLaneOccupiedColor
- : NSColor.labelColor
- ).cgColor
+ column.appNameLayer.foregroundColor = (isHovered ? NSColor.white : NSColor.labelColor).cgColor
column.countLayer.frame = CGRect(
x: bounds.width - 48,
y: bounds.height - 24,
width: 36,
height: 16
)
+ column.countLayer.foregroundColor = (isHovered ? NSColor.white : NSColor.secondaryLabelColor).cgColor
let appGroupIndex = column.column.appGroupIndex
let verticalOffset = clampedWaterfallColumnOffset(
@@ -3748,10 +3932,13 @@
let bounds = card.containerLayer.bounds
let isSelected = card.item.window.id == effectiveSelection?.windowID
let isHovered = card.item.window.id == hoveredWindowID
+ let isAppLinked = isHorizontalMasonryMode
+ && card.item.appGroupIndex == appIconHoverLinkedAppGroupIndex
applyWaterfallCardVisualState(
card,
selected: shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered),
- hovered: isHovered
+ hovered: isHovered,
+ appLinked: isAppLinked
)
let outerInset: CGFloat = 0
@@ -3814,12 +4001,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)
@@ -3828,27 +4022,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
+ card.containerLayer.zPosition = selected ? 20 : hovered ? 12 : appLinked ? 10 : isSpaceFocused ? 8 : 0
let focusedScale: CGFloat = selected ? 1.015 : 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,
@@ -3856,7 +4054,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
@@ -4405,6 +4605,43 @@
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 {
guard !isHorizontalMasonryMode else { return 0 }
return max(0, waterfallContentWidth - waterfallLayer.bounds.width)
@@ -4522,21 +4759,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(
@@ -4740,17 +4962,11 @@
let bounds = shapeLayer.bounds
if isSplitView {
- let insetBounds = bounds.insetBy(dx: 0.6, dy: 0.6)
- let radius = min(7, max(5, insetBounds.height * 0.22))
let path = CGMutablePath()
- path.addRoundedRect(
- in: insetBounds,
- cornerWidth: radius,
- cornerHeight: radius
- )
- path.move(to: CGPoint(x: bounds.midX, y: insetBounds.minY + 1.5))
- path.addLine(to: CGPoint(x: bounds.midX, y: insetBounds.maxY - 1.5))
+ path.move(to: CGPoint(x: bounds.midX, y: bounds.minY))
+ path.addLine(to: CGPoint(x: bounds.midX, y: bounds.maxY))
shapeLayer.path = path
+ shapeLayer.lineCap = .butt
return
}
@@ -4774,6 +4990,7 @@
path.addLine(to: CGPoint(x: 0, y: bounds.maxY - cornerLength))
shapeLayer.path = path
+ shapeLayer.lineCap = .round
}
private func fullscreenMarkerFrame(in segmentBounds: CGRect) -> CGRect {
@@ -4896,12 +5113,14 @@
"frame": dictionary(from: column.containerLayer.frame),
"visibleFrame": dictionary(from: visibleFrame),
"headerFrame": dictionary(from: column.headerLayer.frame),
+ "headerBackgroundColor": colorDictionary(from: column.headerLayer.backgroundColor),
"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)
@@ -4988,6 +5207,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),
@@ -5095,6 +5315,8 @@
var states: [String] = []
let isSelected = card.item.window.id == effectiveSelection?.windowID
let isHovered = card.item.window.id == hoveredWindowID
+ let isAppLinked = isHorizontalMasonryMode
+ && card.item.appGroupIndex == appIconHoverLinkedAppGroupIndex
if shouldShowSelectedVisual(isSelected: isSelected, isHovered: isHovered) {
states.append("selected")
} else if isSelected {
@@ -5102,6 +5324,9 @@
}
if isHovered {
states.append("hover")
+ }
+ if isAppLinked {
+ states.append("appLinked")
}
if isWaterfallCardSpaceFocused(card) {
states.append("spaceFocused")
@@ -5176,6 +5401,10 @@
markerLayer: segment.fullscreenMarkerLayer,
splitAppNames: splitAppNames
),
+ "fullscreenMarkerPathStyle": fullscreenMarkerPathStyle(
+ markerLayer: segment.fullscreenMarkerLayer,
+ splitAppNames: splitAppNames
+ ),
"fullscreenMarkerFrame": fullscreenMarkerFrame.map { dictionary(from: $0) } ?? NSNull(),
"fullscreenMarkerCenterRatio": fullscreenMarkerCenterRatio ?? NSNull(),
"splitViewAppNames": splitAppNames,
@@ -5187,6 +5416,8 @@
"windowBlockColors": segment.windowBlocks.map { colorDictionary(from: $0.backgroundColor) },
"windowBlockFrames": segment.windowBlocks.map { dictionary(from: $0.frame) },
"labelColor": colorDictionary(from: segment.labelLayer.foregroundColor),
+ "countText": string(from: segment.countLayer.string),
+ "countVisible": !segment.countLayer.isHidden && segment.countLayer.opacity > 0,
"countColor": colorDictionary(from: segment.countLayer.foregroundColor),
"appColor": colorDictionary(from: segment.appLayer.foregroundColor),
"fullscreenMarkerStrokeColor": colorDictionary(
@@ -5229,6 +5460,11 @@
private func fullscreenMarkerKind(markerLayer: CALayer?, splitAppNames: [String]) -> String {
guard markerLayer != nil else { return "none" }
return splitAppNames.count >= 2 ? "splitViewPair" : "cornerBracket"
+ }
+
+ private func fullscreenMarkerPathStyle(markerLayer: CALayer?, splitAppNames: [String]) -> String {
+ guard markerLayer != nil else { return "none" }
+ return splitAppNames.count >= 2 ? "centerDividerOnly" : "cornerBracket"
}
private func visualStates(for space: QuickSwitchSpaceViewModel) -> [String] {
@@ -5282,6 +5518,16 @@
]
}
+ private func string(from textLayerValue: Any?) -> String {
+ if let string = textLayerValue as? String {
+ return string
+ }
+ if let attributedString = textLayerValue as? NSAttributedString {
+ return attributedString.string
+ }
+ return ""
+ }
+
private func colorDictionary(from color: CGColor?) -> [String: Double] {
guard let color,
let nsColor = NSColor(cgColor: color)?.usingColorSpace(.deviceRGB)
--
Gitblit v1.9.3