Always consider the scroller and reduce padding

openvanilla · Nov 30, 2023 · aaaad08 · aaaad08
1 parent 86f3f21
commit aaaad08
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift b/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift
@@ -184,7 +184,7 @@ public class VerticalCandidateController: CandidateController {
     }
 
     public override func reloadData() {
-        maxCandidateAttrStringWidth = ceil(candidateFont.pointSize * 2.0 + candidateTextPadding)
+        maxCandidateAttrStringWidth = ceil(candidateFont.pointSize * 1.0 + candidateTextPadding)
         tableView.reloadData()
         layoutCandidateView()
         if delegate?.candidateCountForController(self) ?? 0 > 0 {
@@ -470,9 +470,7 @@ extension VerticalCandidateController: NSTableViewDataSource, NSTableViewDelegat
             let verticalScroller = scrollView.verticalScroller
             verticalScroller?.controlSize = controlSize
             verticalScroller?.scrollerStyle = NSScroller.preferredScrollerStyle
-            if NSScroller.preferredScrollerStyle == .legacy {
-                scrollerWidth = NSScroller.scrollerWidth(for: controlSize, scrollerStyle: NSScroller.preferredScrollerStyle)
-            }
+            scrollerWidth = NSScroller.scrollerWidth(for: controlSize, scrollerStyle: NSScroller.preferredScrollerStyle)
         }
 
         keyLabelStripView.keyLabelFont = keyLabelFont