github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-23 19:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix nil face error and refactor icon faces.

Browse source
This commit is contained in:
Vincent Zhang 2019-05-06 04:17:39 +08:00
parent 86142a68cf
commit 4795a3b3a8
1 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
doom-modeline-segments.el
View file

@ -377,12 +377,11 @@ directory, the file name, and its state (modified, read-only or non-existent)."
(doom-modeline-update-buffer-file-icon)))) (doom-modeline-update-buffer-file-icon))))
(unless (string-empty-p icon) (unless (string-empty-p icon)
(concat (concat
(if (and active doom-modeline-major-mode-color-icon)
icon
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
;; TODO: doom-modeline-major-mode-color-icon
,(get-text-property 0 'face icon) ,(get-text-property 0 'face icon)
:inherit :inherit
,(if active 'mode-line 'mode-line-inactive)))) ,(if active 'mode-line 'mode-line-inactive)))
(if active doom-modeline-vspc doom-modeline-inactive-vspc))))) (if active doom-modeline-vspc doom-modeline-inactive-vspc)))))
;; state icon ;; state icon
@ -390,12 +389,10 @@ directory, the file name, and its state (modified, read-only or non-existent)."
(doom-modeline-update-buffer-file-state-icon)))) (doom-modeline-update-buffer-file-state-icon))))
(unless (string-empty-p icon) (unless (string-empty-p icon)
(concat (concat
(if active
icon
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(get-text-property 0 'face icon) ,(get-text-property 0 'face icon)
:inherit :inherit
mode-line-inactive))) ,(if active 'mode-line 'mode-line-inactive)))
(if active doom-modeline-vspc doom-modeline-inactive-vspc)))) (if active doom-modeline-vspc doom-modeline-inactive-vspc))))
;; buffer file name ;; buffer file name
@ -595,18 +592,16 @@ Uses `all-the-icons-octicon' to fetch the icon."
(text (or doom-modeline--vcs-text (doom-modeline-update-vcs-text)))) (text (or doom-modeline--vcs-text (doom-modeline-update-vcs-text))))
(concat (concat
(propertize " " 'face (if active 'mode-line 'mode-line-inactive)) (propertize " " 'face (if active 'mode-line 'mode-line-inactive))
(if active
(concat icon
(if doom-modeline-icon
doom-modeline-vspc)
text)
(concat
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face icon)) ,(if doom-modeline-icon (get-text-property 0 'face icon))
:inherit :inherit
mode-line-inactive)) ,(if active 'mode-line 'mode-line-inactive)))
doom-modeline-inactive-vspc (if doom-modeline-icon
(propertize text 'face 'mode-line-inactive))) (if active doom-modeline-vspc doom-modeline-inactive-vspc))
(propertize text 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face text))
:inherit
,(if active 'mode-line 'mode-line-inactive)))
(propertize " " 'face (if active 'mode-line 'mode-line-inactive)))))) (propertize " " 'face (if active 'mode-line 'mode-line-inactive))))))
@ -921,18 +916,18 @@ icons."
(concat (concat
(propertize (if vc-mode " " " ") (propertize (if vc-mode " " " ")
'face (if active 'mode-line 'mode-line-inactive)) 'face (if active 'mode-line 'mode-line-inactive))
(if active
(concat icon
(when (and doom-modeline-icon icon text) doom-modeline-vspc)
text)
(concat
(when icon (when icon
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face icon)) ,(if doom-modeline-icon (get-text-property 0 'face icon))
:inherit :inherit
mode-line-inactive))) ,(if active 'mode-line 'mode-line-inactive))))
(when (and doom-modeline-icon icon text) doom-modeline-inactive-vspc) (when (and doom-modeline-icon icon text)
(when text (propertize text 'face 'mode-line-inactive)))) (if active doom-modeline-vspc doom-modeline-inactive-vspc))
(when text
(propertize text 'face `(:inherit
,(if active
(get-text-property 0 'face text)
'mode-line-inactive))))
" ")) " "))
""))) "")))
@ -2077,7 +2072,7 @@ we don't want to remove that so we just return the original."
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face icon)) ,(if doom-modeline-icon (get-text-property 0 'face icon))
:inherit :inherit
,(unless active 'mode-line-inactive)))))) ,(if active 'mode-line 'mode-line-inactive))))))
(when paradox-display-buffer-name (when paradox-display-buffer-name
(propertize (format " %%%sb" (length (buffer-name))) (propertize (format " %%%sb" (length (buffer-name)))