From 1797e722aa5453f646187ab61483f70f7e19fd1f Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 29 May 2026 04:58:31 +0800
Subject: [PATCH] Extract quick search panel
---
Apptag/AppGridCollectionView.swift | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Apptag/AppGridCollectionView.swift b/Apptag/AppGridCollectionView.swift
index 3516782..013e915 100644
--- a/Apptag/AppGridCollectionView.swift
+++ b/Apptag/AppGridCollectionView.swift
@@ -158,7 +158,6 @@
iconSize: iconSize,
showNames: showNames,
showUncommonAppBubbles: showUncommonAppBubbles,
- highlightedGroupName: highlightedGroupName,
contentRevision: contentRevision
)
if nextSignature != contentSignature {
@@ -235,7 +234,6 @@
iconSize: CGFloat,
showNames: Bool,
showUncommonAppBubbles: Bool,
- highlightedGroupName: String?,
contentRevision: Int
) -> String {
let colorPart = tagColors
@@ -247,7 +245,6 @@
"\(Int(iconSize.rounded()))",
showNames ? "names" : "nonames",
showUncommonAppBubbles ? "uncommon" : "allbubbles",
- highlightedGroupName ?? "",
colorPart,
"rev=\(contentRevision)"
].joined(separator: "|")
@@ -951,8 +948,9 @@
guard let coordinator, let group else { return }
let displayStyle = coordinator.displayStyle
let tagColor = TagColor.nsColor(for: coordinator.tagColors[group.name] ?? 0)
+ let isNavigationHighlighted = coordinator.highlightedGroupName == group.name
let isColorlessActive = coordinator.isColorlessContainerMode
- && (isHovered || coordinator.highlightedGroupName == group.name)
+ && (isHovered || isNavigationHighlighted)
if displayStyle.usesCardSurface {
let rect = bounds.insetBy(dx: 0.5, dy: 0.5)
@@ -1033,10 +1031,11 @@
private func updateCardShadow() {
guard let coordinator else { return }
+ let isNavigationHighlighted = coordinator.highlightedGroupName == group?.name
let isColorlessActive = coordinator.isColorlessContainerMode
- && (isHovered || coordinator.highlightedGroupName == group?.name)
+ && (isHovered || isNavigationHighlighted)
let shouldShadow = coordinator.displayStyle.usesCardSurface
- && ((coordinator.isColoredContainerMode && isHovered) || isColorlessActive)
+ && ((coordinator.isColoredContainerMode && (isHovered || isNavigationHighlighted)) || isColorlessActive)
layer?.shadowColor = NSColor.black.cgColor
layer?.shadowOpacity = shouldShadow ? 0.22 : 0
layer?.shadowRadius = shouldShadow ? 8 : 0
--
Gitblit v1.9.3