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

TDKCandidates // Implement CTFontCreateUIFontForLanguage().

This commit is contained in:
ShikiSuen 2022-10-24 11:47:17 +08:00
parent 714632e1c8
commit c9c81803b8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData.swift
View File

@ -150,9 +150,10 @@ extension CandidateCellData {
Text(AttributedString(attributedStringHeader)) Text(AttributedString(attributedStringHeader))
Text(AttributedString(attributedString)) Text(AttributedString(attributedString))
} else { } else {
Text(key).font(.system(size: fontSizeKey).monospaced()) Text(verbatim: key).font(.system(size: fontSizeKey).monospaced())
.foregroundColor(.init(nsColor: fontColorKey)).lineLimit(1) .foregroundColor(.init(nsColor: fontColorKey)).lineLimit(1)
Text(displayedText).font(.system(size: fontSizeCandidate)) Text(verbatim: displayedText)
.font(.init(CTFontCreateUIFontForLanguage(.system, fontSizeCandidate, locale as CFString)!))
.foregroundColor(.init(nsColor: fontColorCandidate)).lineLimit(1) .foregroundColor(.init(nsColor: fontColorCandidate)).lineLimit(1)
} }
}.padding(3) }.padding(3)
@ -187,18 +188,20 @@ extension CandidateCellData {
themeColorBackports.cornerRadius(6) themeColorBackports.cornerRadius(6)
VStack(spacing: 0) { VStack(spacing: 0) {
HStack(spacing: 4) { HStack(spacing: 4) {
Text(key).font(.custom("Menlo", size: fontSizeKey)) Text(verbatim: key).font(.custom("Menlo", size: fontSizeKey))
.foregroundColor(Color.white.opacity(0.8)).lineLimit(1) .foregroundColor(Color.white.opacity(0.8)).lineLimit(1)
Text(displayedText).font(.system(size: fontSizeCandidate)) Text(verbatim: displayedText)
.font(.init(CTFontCreateUIFontForLanguage(.system, fontSizeCandidate, locale as CFString)!))
.foregroundColor(Color(white: 1)).lineLimit(1) .foregroundColor(Color(white: 1)).lineLimit(1)
}.padding(3).foregroundColor(Color(white: 0.9)) }.padding(3).foregroundColor(Color(white: 0.9))
} }
} else { } else {
VStack(spacing: 0) { VStack(spacing: 0) {
HStack(spacing: 4) { HStack(spacing: 4) {
Text(key).font(.custom("Menlo", size: fontSizeKey)) Text(verbatim: key).font(.custom("Menlo", size: fontSizeKey))
.foregroundColor(Color.secondary).lineLimit(1) .foregroundColor(Color.secondary).lineLimit(1)
Text(displayedText).font(.system(size: fontSizeCandidate)) Text(verbatim: displayedText)
.font(.init(CTFontCreateUIFontForLanguage(.system, fontSizeCandidate, locale as CFString)!))
.foregroundColor(Color.primary).lineLimit(1) .foregroundColor(Color.primary).lineLimit(1)
}.padding(3).foregroundColor(Color(white: 0.9)) }.padding(3).foregroundColor(Color(white: 0.9))
} }