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

TDKCandidates // Fix font clipping when lang identifier is enabled.

This commit is contained in:
ShikiSuen 2022-10-01 12:17:34 +08:00
parent 5b0c80db1b
commit bcbb7e5cd7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellDataExtension.swift
View File

@ -20,7 +20,7 @@ extension CandidateCellData {
VStack(spacing: 0) { VStack(spacing: 0) {
HStack(spacing: 4) { HStack(spacing: 4) {
if UserDefaults.standard.bool(forKey: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue) { if UserDefaults.standard.bool(forKey: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue) {
Text(AttributedString(attributedStringHeader)).frame(width: CandidateCellData.unifiedSize / 2) Text(AttributedString(attributedStringHeader)).frame(width: CandidateCellData.unifiedSize * 2 / 3)
Text(AttributedString(attributedString)) Text(AttributedString(attributedString))
} else { } else {
Text(key).font(.system(size: fontSizeKey).monospaced()) Text(key).font(.system(size: fontSizeKey).monospaced())

8
Packages/vChewing_Shared/Sources/Shared/CandidateBasicUnits.swift
View File

@ -60,8 +60,14 @@ public class CandidateCellData: Hashable {
let paraStyle = NSMutableParagraphStyle() let paraStyle = NSMutableParagraphStyle()
paraStyle.setParagraphStyle(NSParagraphStyle.default) paraStyle.setParagraphStyle(NSParagraphStyle.default)
paraStyle.alignment = .natural paraStyle.alignment = .natural
let theFontForCandidateKey: NSFont = {
if #available(macOS 10.15, *) {
return NSFont.monospacedSystemFont(ofSize: size * 0.7, weight: .regular)
}
return NSFont.monospacedDigitSystemFont(ofSize: size * 0.7, weight: .regular)
}()
var attrKey: [NSAttributedString.Key: AnyObject] = [ var attrKey: [NSAttributedString.Key: AnyObject] = [
.font: NSFont.monospacedDigitSystemFont(ofSize: size * 0.7, weight: .regular), .font: theFontForCandidateKey,
.paragraphStyle: paraStyleKey, .paragraphStyle: paraStyleKey,
] ]
if isSelected { if isSelected {