Refactor.

This commit is contained in:
Vincent Zhang 2019-05-03 23:43:50 +08:00
parent 8209edf915
commit 413d414dd9

View file

@ -188,14 +188,14 @@ buffer where knowing the current project directory is important."
(let ((face (if (doom-modeline--active) (let ((face (if (doom-modeline--active)
'doom-modeline-buffer-path 'doom-modeline-buffer-path
'mode-line-inactive))) 'mode-line-inactive)))
(concat (if (display-graphic-p) " ") (concat " "
(doom-modeline-icon-octicon (doom-modeline-icon-octicon
"file-directory" "file-directory"
:face face :face face
:v-adjust -0.05 :v-adjust -0.05
:height 1.25) :height 1.25)
(propertize (concat " " (abbreviate-file-name default-directory)) (if (display-graphic-p) " ")
'face face)))) (propertize (abbreviate-file-name default-directory) 'face face))))
;; ;;
(defvar-local doom-modeline--buffer-file-icon nil) (defvar-local doom-modeline--buffer-file-icon nil)
@ -922,10 +922,7 @@ icons."
:inherit :inherit
mode-line-inactive))) mode-line-inactive)))
(when (and doom-modeline-icon icon text) doom-modeline-inactive-vspc) (when (and doom-modeline-icon icon text) doom-modeline-inactive-vspc)
(when text (propertize text 'face 'mode-line-inactive)))) (when text (propertize text 'face 'mode-line-inactive))))))
;; Adjust the position of the last icon
(if (and (display-graphic-p) (bound-and-true-p fancy-battery-mode))
(propertize " " 'face (if active 'mode-line 'mode-line-inactive)))))
""))) "")))