From 7c354a5b6c4cf8c4ac4a488e68a334db18a11be0 Mon Sep 17 00:00:00 2001 From: Lukhnos Liu Date: Tue, 11 Jan 2022 20:36:27 -0800 Subject: [PATCH] Fix regression in vertical candidate UI The table view style must be set before it's added as the scroll view's content view. See [1]. [1] https://github.com/openvanilla/McBopomofo/blob/1.1/Source/CandidateUI/VTVerticalCandidateController.m#L110 --- .../CandidateUI/VerticalCandidateController.swift | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift b/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift index 495da285..d63576e5 100644 --- a/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift +++ b/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift @@ -140,10 +140,15 @@ public class VerticalCandidateController: CandidateController { tableView.allowsMultipleSelection = false tableView.allowsEmptySelection = false + if #available(macOS 10.16, *) { + tableView.style = .fullWidth + candidateTextPadding = kCandidateTextPaddingWithMandatedTableViewPadding + candidateTextLeftMargin = kCandidateTextLeftMarginWithMandatedTableViewPadding + } + scrollView.documentView = tableView panel.contentView?.addSubview(scrollView) - let paraStyle = NSMutableParagraphStyle() paraStyle.setParagraphStyle(NSParagraphStyle.default) paraStyle.firstLineHeadIndent = candidateTextLeftMargin @@ -151,13 +156,6 @@ public class VerticalCandidateController: CandidateController { candidateTextParagraphStyle = paraStyle - - if #available(macOS 10.16, *) { - tableView.style = .fullWidth - candidateTextPadding = kCandidateTextPaddingWithMandatedTableViewPadding - candidateTextLeftMargin = kCandidateTextLeftMarginWithMandatedTableViewPadding - } - super.init(window: panel) tableView.dataSource = self tableView.delegate = self