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

ctlCandUniv // Make it look more resemble to IMKCandidates.

This commit is contained in:
ShikiSuen 2022-08-12 18:04:29 +08:00
parent 1b639e94f5
commit 58b730a876
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/UI/CandidateUI/ctlCandidateUniversal.swift
View File

@ -82,7 +82,7 @@ private class vwrCandidateUniversal: NSView {
switch isVerticalLayout { switch isVerticalLayout {
case true: case true:
if calculatedWindowWidth < rctCandidate.size.width { if calculatedWindowWidth < rctCandidate.size.width {
calculatedWindowWidth = rctCandidate.size.width + cellPadding calculatedWindowWidth = rctCandidate.size.width + cellPadding * 2
} }
case false: case false:
if cellWidth < cellHeight * 1.35 { if cellWidth < cellHeight * 1.35 {
@ -137,46 +137,40 @@ private class vwrCandidateUniversal: NSView {
NSColor.controlBackgroundColor.setFill() // Candidate list panel base background NSColor.controlBackgroundColor.setFill() // Candidate list panel base background
NSBezierPath.fill(bounds) NSBezierPath.fill(bounds)
NSColor.systemGray.withAlphaComponent(0.75).setStroke()
NSBezierPath.strokeLine(
from: NSPoint(x: bounds.size.width, y: 0.0),
to: NSPoint(x: bounds.size.width, y: bounds.size.height)
)
switch isVerticalLayout { switch isVerticalLayout {
case true: case true:
var accuHeight: CGFloat = 0 var accuHeight: CGFloat = 0
for (index, elementHeight) in elementHeights.enumerated() { for (index, elementHeight) in elementHeights.enumerated() {
let currentHeight = elementHeight let currentHeight = elementHeight
let rctCandidateArea = NSRect( let rctCandidateArea = NSRect(
x: 0.0, y: accuHeight, width: windowWidth, height: candidateTextHeight + cellPadding x: 3.0, y: accuHeight + 3.0, width: windowWidth - 6.0,
height: candidateTextHeight + cellPadding - 6.0
) )
let rctLabel = NSRect( let rctLabel = NSRect(
x: cellPadding / 2 - 1, y: accuHeight + cellPadding / 2, width: keyLabelWidth, x: cellPadding / 2 + 2, y: accuHeight + cellPadding / 2, width: keyLabelWidth,
height: keyLabelHeight * 2.0 height: keyLabelHeight * 2.0
) )
let rctCandidatePhrase = NSRect( let rctCandidatePhrase = NSRect(
x: cellPadding / 2 - 1 + keyLabelWidth, y: accuHeight + cellPadding / 2 - 1, x: cellPadding / 2 + 2 + keyLabelWidth, y: accuHeight + cellPadding / 2 - 1,
width: windowWidth - keyLabelWidth, height: candidateTextHeight width: windowWidth - keyLabelWidth, height: candidateTextHeight
) )
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 let colorBlendAmount: CGFloat = IME.isDarkMode() ? 0.3 : 0
// The background color of the highlightened candidate // The background color of the highlightened candidate
switch IME.currentInputMode { switch IME.currentInputMode {
case InputMode.imeModeCHS: case InputMode.imeModeCHS:
NSColor.systemRed.blended( NSColor.systemRed.blended(
withFraction: colorBlendAmount, withFraction: colorBlendAmount,
of: NSColor.controlBackgroundColor of: NSColor.black
)! )!
.setFill() .setFill()
case InputMode.imeModeCHT: case InputMode.imeModeCHT:
NSColor.systemBlue.blended( NSColor.systemBlue.blended(
withFraction: colorBlendAmount, withFraction: colorBlendAmount,
of: NSColor.controlBackgroundColor of: NSColor.black
)! )!
.setFill() .setFill()
default: default:
@ -190,7 +184,8 @@ private class vwrCandidateUniversal: NSView {
} else { } else {
NSColor.controlBackgroundColor.setFill() NSColor.controlBackgroundColor.setFill()
} }
NSBezierPath.fill(rctCandidateArea) let path: NSBezierPath = .init(roundedRect: rctCandidateArea, xRadius: 5, yRadius: 5)
path.fill()
(keyLabels[index] as NSString).draw( (keyLabels[index] as NSString).draw(
in: rctLabel, withAttributes: activeCandidateIndexAttr in: rctLabel, withAttributes: activeCandidateIndexAttr
) )
@ -204,8 +199,8 @@ private class vwrCandidateUniversal: NSView {
for (index, elementWidth) in elementWidths.enumerated() { for (index, elementWidth) in elementWidths.enumerated() {
let currentWidth = elementWidth let currentWidth = elementWidth
let rctCandidateArea = NSRect( let rctCandidateArea = NSRect(
x: accuWidth, y: 0.0, width: currentWidth + 1.0, x: accuWidth + 3.0, y: 3.0, width: currentWidth + 1.0 - 6.0,
height: candidateTextHeight + cellPadding height: candidateTextHeight + cellPadding - 6.0
) )
let rctLabel = NSRect( let rctLabel = NSRect(
x: accuWidth + cellPadding / 2 - 1, y: cellPadding / 2, width: keyLabelWidth, x: accuWidth + cellPadding / 2 - 1, y: cellPadding / 2, width: keyLabelWidth,
@ -220,19 +215,19 @@ private class vwrCandidateUniversal: 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 let colorBlendAmount: CGFloat = IME.isDarkMode() ? 0.3 : 0
// The background color of the highlightened candidate // The background color of the highlightened candidate
switch IME.currentInputMode { switch IME.currentInputMode {
case InputMode.imeModeCHS: case InputMode.imeModeCHS:
NSColor.systemRed.blended( NSColor.systemRed.blended(
withFraction: colorBlendAmount, withFraction: colorBlendAmount,
of: NSColor.controlBackgroundColor of: NSColor.black
)! )!
.setFill() .setFill()
case InputMode.imeModeCHT: case InputMode.imeModeCHT:
NSColor.systemBlue.blended( NSColor.systemBlue.blended(
withFraction: colorBlendAmount, withFraction: colorBlendAmount,
of: NSColor.controlBackgroundColor of: NSColor.black
)! )!
.setFill() .setFill()
default: default:
@ -246,7 +241,8 @@ private class vwrCandidateUniversal: NSView {
} else { } else {
NSColor.controlBackgroundColor.setFill() NSColor.controlBackgroundColor.setFill()
} }
NSBezierPath.fill(rctCandidateArea) let path: NSBezierPath = .init(roundedRect: rctCandidateArea, xRadius: 5, yRadius: 5)
path.fill()
(keyLabels[index] as NSString).draw( (keyLabels[index] as NSString).draw(
in: rctLabel, withAttributes: activeCandidateIndexAttr in: rctLabel, withAttributes: activeCandidateIndexAttr
) )
@ -352,10 +348,10 @@ public class ctlCandidateUniversal: ctlCandidate {
candidateView.wantsLayer = true candidateView.wantsLayer = true
candidateView.layer?.borderColor = candidateView.layer?.borderColor =
NSColor.selectedMenuItemTextColor.withAlphaComponent(0.10).cgColor NSColor.selectedMenuItemTextColor.withAlphaComponent(0.20).cgColor
candidateView.layer?.borderWidth = 1.0 candidateView.layer?.borderWidth = 1.0
if #available(macOS 10.13, *) { if #available(macOS 10.13, *) {
candidateView.layer?.cornerRadius = 6.0 candidateView.layer?.cornerRadius = 8.0
} }
panel.contentView?.addSubview(candidateView) panel.contentView?.addSubview(candidateView)