From 933e0a66306b7bd53d67f48834cb7f56f5cd8d1b Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 04 Jun 2026 15:16:41 +0800
Subject: [PATCH] fix quick switch shelf badges and space labels
---
C1.source/Sources/Aligner/QuickSwitchRootView.swift | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/C1.source/Sources/Aligner/QuickSwitchRootView.swift b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
index 739b941..4e3051e 100644
--- a/C1.source/Sources/Aligner/QuickSwitchRootView.swift
+++ b/C1.source/Sources/Aligner/QuickSwitchRootView.swift
@@ -1251,17 +1251,12 @@
badge.masksToBounds = true
let selectedIndicator = CALayer()
- selectedIndicator.cornerRadius = 2
- selectedIndicator.backgroundColor = (item.appGroupIndex == selectedAppGroupIndex
- ? NSColor.controlAccentColor
- : NSColor.clear
- ).cgColor
+ selectedIndicator.isHidden = true
container.addSublayer(background)
container.addSublayer(icon)
container.addSublayer(label)
container.addSublayer(badge)
- container.addSublayer(selectedIndicator)
appShelfContentLayer.addSublayer(container)
return AppShelfItemLayers(
@@ -1837,21 +1832,13 @@
: NSColor.controlAccentColor.withAlphaComponent(0.90)
).cgColor
item.badgeLayer.frame = CGRect(
- x: iconX + visualIconSize - badgeWidth + 3,
- y: iconY + visualIconSize - 14,
+ x: iconX - 3,
+ y: iconY - 2,
width: badgeWidth,
height: 16
)
- item.selectedIndicatorLayer.frame = CGRect(
- x: bounds.midX - 8,
- y: 0,
- width: 16,
- height: 4
- )
- item.selectedIndicatorLayer.backgroundColor = (isSelected
- ? NSColor.controlAccentColor
- : NSColor.clear
- ).cgColor
+ item.selectedIndicatorLayer.frame = .zero
+ item.selectedIndicatorLayer.backgroundColor = NSColor.clear.cgColor
}
private func appShelfRows() -> [[AppShelfItemLayers]] {
--
Gitblit v1.9.3