mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Improve display of tabulated list header line labels (bug#44068)

Browse source 
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-init-header):
Ensure sort indicator appears after the label of any selected
sortable column that is wide enough and enable label truncation
when narrowing a column.

* lisp/emacs-lisp/timer-list.el (timer-list-mode): Improve column
alignment.
(timer-list--function-predicate): Correct typo in doc string.
This commit is contained in:
Stephen Berman 2020-11-04 23:52:21 +01:00
parent 1c9500da66
commit 233d350d19
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lisp/emacs-lisp/tabulated-list.el
View file

@ -269,42 +269,48 @@ Populated by `tabulated-list-init-header'.")
;; FIXME: Should share code with tabulated-list-print-col!
(let ((x (max tabulated-list-padding 0))
(button-props `(help-echo "Click to sort by column"
mouse-face header-line-highlight
keymap ,tabulated-list-sort-button-map))
mouse-face header-line-highlight
keymap ,tabulated-list-sort-button-map))
(len (length tabulated-list-format))
(cols nil))
(if display-line-numbers
(setq x (+ x (tabulated-list-line-number-width))))
(push (propertize " " 'display `(space :align-to ,x)) cols)
(dotimes (n (length tabulated-list-format))
(dotimes (n len)
(let* ((col (aref tabulated-list-format n))
(not-last-col (< n (1- len)))
(label (nth 0 col))
(lablen (length label))
(pname label)
(width (nth 1 col))
(props (nthcdr 3 col))
(pad-right (or (plist-get props :pad-right) 1))
(right-align (plist-get props :right-align))
(next-x (+ x pad-right width)))
(when (and (>= lablen 3) (> lablen width) not-last-col)
(setq label (truncate-string-to-width label (- lablen 1) nil nil t)))
(push
(cond
;; An unsortable column
((not (nth 2 col))
(propertize label 'tabulated-list-column-name label))
(propertize label 'tabulated-list-column-name pname))
;; The selected sort column
((equal (car col) (car tabulated-list-sort-key))
(apply 'propertize
(concat label
(cond
((> (+ 2 (length label)) width) "")
((cdr tabulated-list-sort-key)
(concat label
(cond
((and (< lablen 3) not-last-col) "")
((cdr tabulated-list-sort-key)
(format " %c"
tabulated-list-gui-sort-indicator-desc))
(t (format " %c"
(t (format " %c"
tabulated-list-gui-sort-indicator-asc))))
'face 'bold
'tabulated-list-column-name label
button-props))
'face 'bold
'tabulated-list-column-name pname
button-props))
;; Unselected sortable column.
(t (apply 'propertize label
'tabulated-list-column-name label
'tabulated-list-column-name pname
button-props)))
cols)
(when right-align