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

Merge pull request #217 from lukhnos/fix-vertical-candidate-ui 

Fix regression in vertical candidate UI
This commit is contained in:
Weizhong Yang a.k.a zonble 2022-01-12 12:52:19 +08:00 committed by GitHub
parent 11d33c0b42 7c354a5b6c
commit 819e1be8d6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift
View File

@ -140,10 +140,15 @@ public class VerticalCandidateController: CandidateController {
tableView.allowsMultipleSelection = false tableView.allowsMultipleSelection = false
tableView.allowsEmptySelection = false tableView.allowsEmptySelection = false
if #available(macOS 10.16, *) {
tableView.style = .fullWidth
candidateTextPadding = kCandidateTextPaddingWithMandatedTableViewPadding
candidateTextLeftMargin = kCandidateTextLeftMarginWithMandatedTableViewPadding
}
scrollView.documentView = tableView scrollView.documentView = tableView
panel.contentView?.addSubview(scrollView) panel.contentView?.addSubview(scrollView)
let paraStyle = NSMutableParagraphStyle() let paraStyle = NSMutableParagraphStyle()
paraStyle.setParagraphStyle(NSParagraphStyle.default) paraStyle.setParagraphStyle(NSParagraphStyle.default)
paraStyle.firstLineHeadIndent = candidateTextLeftMargin paraStyle.firstLineHeadIndent = candidateTextLeftMargin
@ -151,13 +156,6 @@ public class VerticalCandidateController: CandidateController {
candidateTextParagraphStyle = paraStyle candidateTextParagraphStyle = paraStyle
if #available(macOS 10.16, *) {
tableView.style = .fullWidth
candidateTextPadding = kCandidateTextPaddingWithMandatedTableViewPadding
candidateTextLeftMargin = kCandidateTextLeftMarginWithMandatedTableViewPadding
}
super.init(window: panel) super.init(window: panel)
tableView.dataSource = self tableView.dataSource = self
tableView.delegate = self tableView.delegate = self