From 27b59f7c2d1730e1ce4908ed76c0df282c78617b Mon Sep 17 00:00:00 2001 From: Soh Satoh <20023945+sohsatoh@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:42:59 +0900 Subject: [PATCH] isSelected -> isHighlighted --- .../QuickTerminal/Tab/QuickTerminalTabBarView.swift | 3 +-- .../QuickTerminal/Tab/QuickTerminalTabItemView.swift | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabBarView.swift b/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabBarView.swift index f6963f1f7..ecf8abe63 100644 --- a/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabBarView.swift +++ b/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabBarView.swift @@ -9,8 +9,7 @@ struct QuickTerminalTabBarView: View { ForEach(tabManager.tabs) { tab in QuickTerminalTabItemView( tab: tab, - isSelected: tab.isActive, - isSingleTab: tabManager.tabs.count == 1, + isHighlighted: tab.isActive, onSelect: { tabManager.selectTab(tab) }, onClose: { tabManager.closeTab(tab) } ) diff --git a/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabItemView.swift b/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabItemView.swift index 8b839d0c8..391962cdd 100644 --- a/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabItemView.swift +++ b/macos/Sources/Features/QuickTerminal/Tab/QuickTerminalTabItemView.swift @@ -2,8 +2,7 @@ import SwiftUI struct QuickTerminalTabItemView: View { @ObservedObject var tab: QuickTerminalTab - let isSelected: Bool - let isSingleTab: Bool + let isHighlighted: Bool let onSelect: () -> Void let onClose: () -> Void @@ -21,7 +20,7 @@ struct QuickTerminalTabItemView: View { .animation(.easeInOut, value: isHovered) Text(tab.title) - .foregroundColor(isSelected ? .primary : .secondary) + .foregroundColor(isHighlighted ? .primary : .secondary) .lineLimit(1) .truncationMode(.tail) .frame(minWidth: 0, maxWidth: .infinity) @@ -31,7 +30,7 @@ struct QuickTerminalTabItemView: View { .background( Rectangle() .fill( - isSelected && !isSingleTab + isHighlighted ? Color(NSColor.controlBackgroundColor) : (isHovered ? Color(NSColor.underPageBackgroundColor) : Color(NSColor.windowBackgroundColor))) )