[elpa] externals/which-key 254d6fdc2b 03/11: Don't pad beyond maximal width

[ELPA Syncer]

branch: externals/which-key
commit 254d6fdc2b3c993b599fc3ca29cda14bc6c0a5fb
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Don't pad beyond maximal width
    
    The old implementation behaved as if the "description" is the only
    information that is being displayed, however in actuality the
    available width has to be shared with the key (and the separator
    between the two).
    
    Failing to take that into account meant that every binding whose
    description isn't *by itself* wider than the width available to
    display all the information got excessive padding, which later has to
    be removed during truncation again (resulting in misleading ellipses).
---
 which-key.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/which-key.el b/which-key.el
index 89bdbe8645..8162d207f7 100644
--- a/which-key.el
+++ b/which-key.el
@@ -1865,15 +1865,18 @@ element in each list element of KEYS."
    (lambda (x y) (max x (which-key--string-width (nth index y))))
    keys :initial-value (if initial-value initial-value 0)))
 
-(defun which-key--pad-column (col-keys)
+(defun which-key--pad-column (col-keys avl-width)
   "Take a column of (key separator description) COL-KEYS,
 calculate the max width in the column and pad all cells out to
 that width."
   (let* ((col-key-width  (+ which-key-add-column-padding
                             (which-key--max-len col-keys 0)))
          (col-sep-width  (which-key--max-len col-keys 1))
-         (col-desc-width (which-key--max-len
-                          col-keys 2 which-key-min-column-description-width))
+        (avl-width      (- avl-width col-key-width col-sep-width))
+         (col-desc-width (min avl-width
+                             (which-key--max-len
+                               col-keys 2
+                              which-key-min-column-description-width)))
          (col-width      (+ 1 col-key-width col-sep-width col-desc-width))
         (col-format     (concat "%" (int-to-string col-key-width)
                                  "s%s%-" (int-to-string col-desc-width) "s")))
@@ -1893,8 +1896,8 @@ that width."
   "Convert list of KEYS to columns based on dimensions AVL-LINES and AVL-WIDTH.
 Returns a `which-key--pages' object that holds the page strings,
 as well as metadata."
-  (let ((cols-w-widths (mapcar #'which-key--pad-column
-                               (which-key--partition-list avl-lines keys)))
+  (let ((cols-w-widths (mapcar (lambda (c) (which-key--pad-column c avl-width))
+                              (which-key--partition-list avl-lines keys)))
         (page-width 0) (n-pages 0) (n-keys 0) (n-columns 0)
         page-cols pages page-widths keys/page col)
     (if (> (apply #'max (mapcar #'car cols-w-widths)) avl-width)