floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Voltaire // Differentiate highlight background colors between NSAppearances.

This commit is contained in:
ShikiSuen 2022-03-09 16:29:24 +08:00
parent 0631752867
commit 529eefc9d3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/UI/CandidateUI/HorizontalCandidateController.swift
View File

@ -118,12 +118,13 @@ fileprivate class HorizontalCandidateView: NSView {
var activeCandidateIndexAttr = keyLabelAttrDict var activeCandidateIndexAttr = keyLabelAttrDict
var activeCandidateAttr = candidateAttrDict var activeCandidateAttr = candidateAttrDict
if index == highlightedIndex { if index == highlightedIndex {
let colorBlendAmount: CGFloat = IME.isDarkMode() ? 0.25 : 0
// The background color of the highlightened candidate // The background color of the highlightened candidate
switch ctlInputMethod.currentKeyHandler.inputMode { switch ctlInputMethod.currentKeyHandler.inputMode {
case InputMode.imeModeCHS: case InputMode.imeModeCHS:
NSColor.systemRed.withAlphaComponent(0.75).setFill() NSColor.systemRed.blended(withFraction: colorBlendAmount, of: NSColor.controlBackgroundColor)!.setFill()
case InputMode.imeModeCHT: case InputMode.imeModeCHT:
NSColor.systemBlue.withAlphaComponent(0.75).setFill() NSColor.systemBlue.blended(withFraction: colorBlendAmount, of: NSColor.controlBackgroundColor)!.setFill()
default: default:
NSColor.alternateSelectedControlColor.setFill() NSColor.alternateSelectedControlColor.setFill()
} }

5
Source/UI/CandidateUI/VerticalCandidateController.swift
View File

@ -124,12 +124,13 @@ fileprivate class VerticalCandidateView: NSView {
var activeCandidateIndexAttr = keyLabelAttrDict var activeCandidateIndexAttr = keyLabelAttrDict
var activeCandidateAttr = candidateAttrDict var activeCandidateAttr = candidateAttrDict
if index == highlightedIndex { if index == highlightedIndex {
let colorBlendAmount: CGFloat = IME.isDarkMode() ? 0.25 : 0
// The background color of the highlightened candidate // The background color of the highlightened candidate
switch ctlInputMethod.currentKeyHandler.inputMode { switch ctlInputMethod.currentKeyHandler.inputMode {
case InputMode.imeModeCHS: case InputMode.imeModeCHS:
NSColor.systemRed.withAlphaComponent(0.75).setFill() NSColor.systemRed.blended(withFraction: colorBlendAmount, of: NSColor.controlBackgroundColor)!.setFill()
case InputMode.imeModeCHT: case InputMode.imeModeCHT:
NSColor.systemBlue.withAlphaComponent(0.75).setFill() NSColor.systemBlue.blended(withFraction: colorBlendAmount, of: NSColor.controlBackgroundColor)!.setFill()
default: default:
NSColor.alternateSelectedControlColor.setFill() NSColor.alternateSelectedControlColor.setFill()
} }