mirror of
https://github.com/correl/doom-modeline.git
synced 2024-11-23 19:19:50 +00:00
Refactor vspc and whitespace.
This commit is contained in:
Vincent Zhang
parent
b50388cc61
commit
c300c80260
2 changed files with 28 additions and 28 deletions
|
|
@ -469,13 +469,21 @@ Given ~/Projects/FOSS/emacs/lisp/comint.el
|
|||
;; Modeline helpers
|
||||
;;
|
||||
|
||||
(defvar doom-modeline-vspc
|
||||
(propertize " " 'face 'variable-pitch)
|
||||
"Text style with icons in mode-line.")
|
||||
(defun doom-modeline--active ()
|
||||
"Whether is an active window."
|
||||
(eq (selected-window) doom-modeline-current-window))
|
||||
|
||||
(defvar doom-modeline-inactive-vspc
|
||||
(propertize " " 'face '(:inherit (variable-pitch mode-line-inactive)))
|
||||
"Text style with icons in inactive mode-line.")
|
||||
(defsubst doom-modeline-vspc ()
|
||||
"Text style with icons in mode-line."
|
||||
(propertize " " 'face (if (doom-modeline--active)
|
||||
'variable-pitch
|
||||
'(:inherit (variable-pitch mode-line-inactive)))))
|
||||
|
||||
(defsubst doom-modeline-whitespace ()
|
||||
"Text style with whitespace."
|
||||
(propertize " " 'face (if (doom-modeline--active)
|
||||
'mode-line
|
||||
'mode-line-inactive)))
|
||||
|
||||
(defun doom-modeline-icon-octicon (&rest args)
|
||||
"Display octicon via ARGS."
|
||||
|
|
@ -512,13 +520,6 @@ Given ~/Projects/FOSS/emacs/lisp/comint.el
|
|||
(when doom-modeline-icon
|
||||
(apply #'all-the-icons-icon-for-file args)))
|
||||
|
||||
(defun doom-modeline--active ()
|
||||
"Whether is an active window."
|
||||
(eq (selected-window) doom-modeline-current-window))
|
||||
|
||||
(defsubst doom-modeline-whitespace ()
|
||||
(propertize " " 'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive)))
|
||||
|
||||
(defvar-local doom-modeline-project-root nil)
|
||||
(defun doom-modeline-project-root ()
|
||||
"Get the path to the root of your project.
|
||||
|
|
|
|||
|
|
@ -392,7 +392,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
|
|||
(remove :inherit props)))
|
||||
:inherit
|
||||
mode-line-inactive)))
|
||||
(if active doom-modeline-vspc doom-modeline-inactive-vspc)))))
|
||||
(doom-modeline-vspc)))))
|
||||
|
||||
;; state icon
|
||||
(when-let ((icon (or doom-modeline--buffer-file-state-icon
|
||||
|
|
@ -408,7 +408,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
|
|||
,(get-text-property 0 'face icon)
|
||||
:inherit
|
||||
mode-line-inactive)))
|
||||
(if active doom-modeline-vspc doom-modeline-inactive-vspc))))
|
||||
(doom-modeline-vspc))))
|
||||
|
||||
;; buffer file name
|
||||
(when-let ((name (or doom-modeline--buffer-file-name
|
||||
|
|
@ -444,7 +444,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
|
|||
'(coding-category-undecided coding-category-utf-8))
|
||||
" UTF-8 ")
|
||||
(t (upcase (symbol-name (plist-get sys :name))))))
|
||||
" ")
|
||||
(doom-modeline-whitespace))
|
||||
'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive)
|
||||
'help-echo 'mode-line-mule-info-help-echo
|
||||
'mouse-face '(:box 0)
|
||||
|
|
@ -633,7 +633,7 @@ Uses `all-the-icons-octicon' to fetch the icon."
|
|||
:inherit
|
||||
mode-line-inactive)))
|
||||
(if doom-modeline-icon
|
||||
(if active doom-modeline-vspc doom-modeline-inactive-vspc))
|
||||
(doom-modeline-vspc))
|
||||
(propertize text 'face
|
||||
(if active `(:inherit
|
||||
,(get-text-property 0 'face text)
|
||||
|
|
@ -973,7 +973,7 @@ icons."
|
|||
:inherit
|
||||
mode-line-inactive))))
|
||||
(when (and doom-modeline-icon icon text)
|
||||
(if active doom-modeline-vspc doom-modeline-inactive-vspc))
|
||||
(doom-modeline-vspc))
|
||||
(when text
|
||||
(if active
|
||||
text
|
||||
|
|
@ -1168,7 +1168,7 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
|
|||
(if doom-modeline-icon
|
||||
(doom-modeline-icon-faicon "i-cursor" :face face :v-adjust -0.0575)
|
||||
(propertize "I" 'face `(:inherit ,face :height 1.4) 'display '(raise -0.085)))
|
||||
(propertize doom-modeline-vspc 'face `(:inherit (variable-pitch ,face)))
|
||||
(propertize (doom-modeline-vspc) 'face `(:inherit (variable-pitch ,face)))
|
||||
(propertize (format "%d " count)
|
||||
'face face)))))
|
||||
|
||||
|
|
@ -1812,7 +1812,7 @@ Example:
|
|||
(doom-modeline-icon-faicon "github"
|
||||
:v-adjust -0.0575
|
||||
:face 'doom-modeline-warning)
|
||||
doom-modeline-vspc)
|
||||
(doom-modeline-vspc))
|
||||
(propertize "#" 'face '(:inherit (doom-modeline-warning doom-modeline-unread-number))))
|
||||
(propertize (number-to-string doom-modeline--github-notifications-number)
|
||||
'face '(:inherit (doom-modeline-warning doom-modeline-unread-number))))
|
||||
|
|
@ -1856,7 +1856,7 @@ mouse-3: Fetch notifications"
|
|||
(and (or debug-on-error debug-on-quit
|
||||
(bound-and-true-p edebug-mode)
|
||||
(bound-and-true-p edebug-x-mode))
|
||||
" ")
|
||||
(doom-modeline-whitespace))
|
||||
|
||||
;; For `dap-mode'
|
||||
(when (and (bound-and-true-p dap-mode)
|
||||
|
|
@ -1919,7 +1919,7 @@ mouse-1: Toggle Debug on Quit"
|
|||
(and (or debug-on-error debug-on-quit
|
||||
(bound-and-true-p edebug-mode)
|
||||
(bound-and-true-p edebug-x-mode))
|
||||
" "))))
|
||||
(doom-modeline-whitespace)))))
|
||||
|
||||
|
||||
;;
|
||||
|
|
@ -1963,7 +1963,7 @@ mouse-1: Toggle Debug on Quit"
|
|||
:height 1.1
|
||||
:v-adjust -0.225
|
||||
:face 'doom-modeline-warning)
|
||||
doom-modeline-vspc)
|
||||
(doom-modeline-vspc))
|
||||
(propertize "#"
|
||||
'face '(:inherit (doom-modeline-warning doom-modeline-unread-number))))
|
||||
(propertize (number-to-string mu4e-alert-mode-line)
|
||||
|
|
@ -2106,8 +2106,7 @@ we don't want to remove that so we just return the original."
|
|||
,(get-text-property 0 'face icon)
|
||||
:inherit ,face)
|
||||
'help-echo help-echo)
|
||||
(if doom-modeline-icon
|
||||
(propertize doom-modeline-vspc 'help-echo help-echo))
|
||||
(if doom-modeline-icon (doom-modeline-vspc))
|
||||
(propertize percent-str
|
||||
'face face
|
||||
'help-echo help-echo))
|
||||
|
|
@ -2184,12 +2183,12 @@ The cdr can also be a function that returns a name to use.")
|
|||
"Helm session identifier."
|
||||
(when (bound-and-true-p helm-alive-p)
|
||||
(concat
|
||||
" "
|
||||
(doom-modeline-whitespace)
|
||||
(doom-modeline-icon-fileicon "elisp" :height 1.0 :v-adjust -0.15
|
||||
:face (if doom-modeline-major-mode-color-icon
|
||||
'all-the-icons-purple
|
||||
'mode-line))
|
||||
(if doom-modeline-icon " ")
|
||||
(if doom-modeline-icon (doom-modeline-whitespace))
|
||||
(propertize
|
||||
(let ((custom (cdr (assoc (buffer-name) doom-modeline--helm-buffer-ids)))
|
||||
(case-fold-search t)
|
||||
|
|
@ -2200,7 +2199,7 @@ The cdr can also be a function that returns a name to use.")
|
|||
(string-match "\\*helm:? \\(mode \\)?\\([^\\*]+\\)\\*" name)
|
||||
(concat "HELM " (capitalize (match-string 2 name))))))
|
||||
'face 'doom-modeline-buffer-file)
|
||||
" ")))
|
||||
(doom-modeline-whitespace))))
|
||||
|
||||
(doom-modeline-def-segment helm-number
|
||||
"Number of helm candidates."
|
||||
|
|
|
|||
Loading…
Reference in a new issue