From 951f41461a7a01f36107b7529e8c54b3cf694389 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sat, 9 Mar 2024 04:14:37 +0800 Subject: [PATCH] TDKCandidates // Refactor highlightedColor(). --- .../CandidateWindow/CtlCandidate.swift | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CtlCandidate.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CtlCandidate.swift index 3ae3ebef..2ee31fb8 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CtlCandidate.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CtlCandidate.swift @@ -17,26 +17,24 @@ open class CtlCandidate: NSWindowController, CtlCandidateProtocol { open var reverseLookupResult: [String] = [] open func highlightedColor() -> NSColor { - var result = NSColor.controlAccentColor - var colorBlendAmount: Double = NSApplication.isDarkMode ? 0.3 : 0.0 - if #available(macOS 10.14, *), !NSApplication.isDarkMode, locale == "zh-Hant" { - colorBlendAmount = 0.15 + var result = NSColor.clear + if #available(macOS 10.14, *) { + result = .controlAccentColor + } else { + result = .alternateSelectedControlTextColor } + let colorBlendAmount = 0.3 // 設定當前高亮候選字的背景顏色。 switch locale { case "zh-Hans": - result = NSColor.systemRed + result = NSColor.red case "zh-Hant": - result = NSColor.systemBlue + result = NSColor.blue case "ja": - result = NSColor.systemBrown + result = NSColor.brown default: break } - var blendingAgainstTarget: NSColor = NSApplication.isDarkMode ? NSColor.black : NSColor.white - if #unavailable(macOS 10.14) { - colorBlendAmount = 0.3 - blendingAgainstTarget = NSColor.white - } + let blendingAgainstTarget: NSColor = NSApplication.isDarkMode ? NSColor.black : NSColor.white return result.blended(withFraction: colorBlendAmount, of: blendingAgainstTarget)! }