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 #141: All the icons icon misalignment when increasing icon scale.

Browse source
This commit is contained in:
Vincent Zhang 2019-03-09 02:32:27 +07:00
parent ff68bfa4e6
commit f5a6fd9d42
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
doom-modeline-segments.el
View file

@ -202,7 +202,7 @@ Uses `all-the-icons-material' to fetch the icon."
icon icon
:face face :face face
:height (or height 1.1) :height (or height 1.1)
:v-adjust (or voffset -0.225))) :v-adjust (or voffset (/ -0.27 all-the-icons-scale-factor))))
(when text (when text
(propertize text 'face face)))) (propertize text 'face face))))
@ -570,7 +570,12 @@ TEXT is the alternative if it is not applicable.
Uses `all-the-icons-material' to fetch the icon." Uses `all-the-icons-material' to fetch the icon."
(if doom-modeline-icon (if doom-modeline-icon
(when icon (when icon
(doom-modeline-icon-material icon :face face :height 1.1 :v-adjust (or voffset -0.225))) (doom-modeline-icon-material
icon
:face face
:height 1.1
:v-adjust (or voffset
(/ -0.27 all-the-icons-scale-factor))))
(when text (when text
(propertize text 'face face)))) (propertize text 'face face))))
@ -1040,17 +1045,17 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
(defsubst doom-modeline--multiple-cursors () (defsubst doom-modeline--multiple-cursors ()
"Show the number of multiple cursors." "Show the number of multiple cursors."
(cl-destructuring-bind (count . face) (cl-destructuring-bind (count . face)
(cond ((bound-and-true-p multiple-cursors-mode) (cond ((bound-and-true-p multiple-cursors-mode)
(cons (eval (cadadr mc/mode-line)) (cons (eval (cadadr mc/mode-line))
(if (doom-modeline--active) (if (doom-modeline--active)
'mode-line-inactive 'mode-line-inactive
'doom-modeline-eldoc-bar))) 'doom-modeline-eldoc-bar)))
((bound-and-true-p evil-mc-cursor-list) ((bound-and-true-p evil-mc-cursor-list)
(cons (length evil-mc-cursor-list) (cons (length evil-mc-cursor-list)
(cond ((not (doom-modeline--active)) 'mode-line-inactive) (cond ((not (doom-modeline--active)) 'mode-line-inactive)
(evil-mc-frozen 'doom-modeline-panel) (evil-mc-frozen 'doom-modeline-panel)
('doom-modeline-eldoc-bar)))) ('doom-modeline-eldoc-bar))))
((cons nil nil))) ((cons nil nil)))
(when count (when count
(concat (propertize " " 'face face) (concat (propertize " " 'face face)
(doom-modeline-icon-faicon "i-cursor" :face face :v-adjust -0.1) (doom-modeline-icon-faicon "i-cursor" :face face :v-adjust -0.1)
@ -1625,7 +1630,7 @@ mouse-1: Toggle Debug on Quit"
(concat (concat
(doom-modeline-icon-material "mail" (doom-modeline-icon-material "mail"
:height 1.1 :height 1.1
:v-adjust -0.225 :v-adjust (/ -0.27 all-the-icons-scale-factor)
:face 'doom-modeline-warning) :face 'doom-modeline-warning)
doom-modeline-vspc) doom-modeline-vspc)
(propertize "#" (propertize "#"
@ -1702,7 +1707,7 @@ we don't want to remove that so we just return the original."
(propertize (if doom-modeline-icon (propertize (if doom-modeline-icon
(doom-modeline-icon-material "message" (doom-modeline-icon-material "message"
:height 1.1 :height 1.1
:v-adjust -0.225 :v-adjust (/ -0.27 all-the-icons-scale-factor)
:face 'doom-modeline-warning) :face 'doom-modeline-warning)
(propertize "#" (propertize "#"
'face '(:inherit (doom-modeline-warning 'face '(:inherit (doom-modeline-warning
@ -1778,7 +1783,10 @@ we don't want to remove that so we just return the original."
'help-echo help-echo)) 'help-echo help-echo))
;; Battery status is not available ;; Battery status is not available
(if doom-modeline-icon (if doom-modeline-icon
(doom-modeline-icon-material "battery_unknown" :height 1.1 :v-adjust -0.225 :face 'error) (doom-modeline-icon-material "battery_unknown"
:height 1.1
:v-adjust (/ -0.27 all-the-icons-scale-factor)
:face 'error)
(propertize "N/A" 'face 'error))) (propertize "N/A" 'face 'error)))
" ")))) " "))))