[Refactor] Add doom-modeline-wspc.

This commit is contained in:
Vincent Zhang 2021-11-06 22:44:01 +08:00
parent 79dc0ca1a9
commit b59802efba
2 changed files with 12 additions and 12 deletions

View file

@ -1010,6 +1010,12 @@ If DEFAULT is non-nil, set the default mode-line for all buffers."
'doom-modeline-spc-face
'(:inherit mode-line-inactive))))
(defsubst doom-modeline-wspc ()
"Text style with wide whitespace."
(propertize " " 'face (if (doom-modeline--active)
'doom-modeline-spc-face
'(:inherit mode-line-inactive))))
(defsubst doom-modeline-vspc ()
"Text style with icons in mode-line."
(propertize " " 'face (if (doom-modeline--active)

View file

@ -1665,8 +1665,7 @@ See `mode-line-percent-position'.")
(mouse-face 'mode-line-highlight)
(local-map mode-line-column-line-number-mode-map))
(concat
(doom-modeline-spc)
(doom-modeline-spc)
(doom-modeline-wspc)
;; Line and column
(propertize (format-mode-line lc)
@ -1682,24 +1681,21 @@ mouse-1: Display Line and Column Mode Menu"
(not doom-modeline--limited-width-p)
(>= (window-width) nyan-minimum-window-width))
(concat
(doom-modeline-spc)
(doom-modeline-spc)
(doom-modeline-wspc)
(propertize (nyan-create) 'mouse-face mouse-face)))
((and active
(bound-and-true-p poke-line-mode)
(not doom-modeline--limited-width-p)
(>= (window-width) poke-line-minimum-window-width))
(concat
(doom-modeline-spc)
(doom-modeline-spc)
(doom-modeline-wspc)
(propertize (poke-line-create) 'mouse-face mouse-face)))
((and active
(bound-and-true-p mlscroll-mode)
(not doom-modeline--limited-width-p)
(>= (window-width) mlscroll-minimum-current-width))
(concat
(doom-modeline-spc)
(doom-modeline-spc)
(doom-modeline-wspc)
(let ((mlscroll-right-align nil))
(format-mode-line (mlscroll-mode-line)))))
((and active
@ -1707,8 +1703,7 @@ mouse-1: Display Line and Column Mode Menu"
(not doom-modeline--limited-width-p)
(>= (window-width) sml-modeline-len))
(concat
(doom-modeline-spc)
(doom-modeline-spc)
(doom-modeline-wspc)
(propertize (sml-modeline-create) 'mouse-face mouse-face)))
(t ""))
@ -1734,8 +1729,7 @@ mouse-1: Display Line and Column Mode Menu"
(when (and (doom-modeline--active)
(not doom-modeline--limited-width-p)
(bound-and-true-p parrot-mode))
(concat (doom-modeline-spc)
(doom-modeline-spc)
(concat (doom-modeline-wspc)
(parrot-create)
(doom-modeline-spc))))