From aaaad0863646d5339937d2cefd1990c1cc1bc99c Mon Sep 17 00:00:00 2001
From: Lukhnos Liu <lukhnos@lukhnos.org>
Date: Wed, 29 Nov 2023 18:09:54 -0800
Subject: [PATCH] Always consider the scroller and reduce padding

---
 .../Sources/CandidateUI/VerticalCandidateController.swift   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift b/Packages/CandidateUI/Sources/CandidateUI/VerticalCandidateController.swift
index f2cd8a64..fbff9e76 100644
--- 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