hiro/doom-modeline
1
0
Fork 0
mirror of https://github.com/vale981/doom-modeline synced 2025-03-05 09:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #303: Unaligned right segment while starting from Emacs daemon.

Browse source 
In terminal and daemon mode, the font width is 1.
This commit is contained in:
Vincent Zhang 2020-02-13 14:03:25 +08:00
parent 209ec76f56
commit 1a55a7bdfe
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
doom-modeline-core.el
View file

@ -627,22 +627,23 @@ It requires `circe' or `erc' package."
((error "%s is not a valid segment" seg))))
(nreverse forms)))
(defvar doom-modeline--font-width nil)
(defvar doom-modeline--font-width-cache nil)
(defun doom-modeline--font-width ()
"Cache the font width."
(let ((attributes (face-all-attributes 'mode-line)))
(or (cdr (assoc attributes doom-modeline--font-width))
(or (cdr (assoc attributes doom-modeline--font-width-cache))
(let ((width (window-font-width nil 'mode-line)))
(push (cons attributes width) doom-modeline--font-width)
(push (cons attributes width) doom-modeline--font-width-cache)
width))))
;; Refresh the font width after setting frame parameters
;; to ensure the font width is correct.
(defun doom-modeline--refresh-font-width ()
(defun doom-modeline-refresh-font-width-cache (&rest _)
"Refresh the font width cache."
(setq doom-modeline--font-width nil)
(setq doom-modeline--font-width-cache nil)
(doom-modeline--font-width))
(add-hook 'window-setup-hook #'doom-modeline--refresh-font-width)
(add-hook 'window-setup-hook #'doom-modeline-refresh-font-width-cache)
(add-hook 'after-make-frame-functions #'doom-modeline-refresh-font-width-cache)
(defun doom-modeline-def-modeline (name lhs &optional rhs)
"Defines a modeline format and byte-compiles it.
@ -663,12 +664,14 @@ It requires `circe' or `erc' package."
(list lhs-forms
(propertize
(doom-modeline-spc)
'display `((space :align-to (- (+ right right-fringe right-margin)
,(* (/ (doom-modeline--font-width)
(frame-char-width) 1.0)
(string-width
(format-mode-line
(cons "" rhs-forms))))))))
'display `((space
:align-to
(- (+ right right-fringe right-margin)
,(* (let ((width (doom-modeline--font-width)))
(or (and (= width 1) 1)
(/ width (frame-char-width) 1.0)))
(string-width
(format-mode-line (cons "" rhs-forms))))))))
rhs-forms))
(concat "Modeline:\n"
(format " %s\n %s"