emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix fonts losing properties when resized

Browse source 
Fixes #5182: fonts lose :weight and :slant when being resized.
Fixes #5146: fonts being remapped too eagerly.
This commit is contained in:
Henrik Lissner 2021-07-09 12:49:14 -04:00
parent 42ff369142
commit bafb392031
1 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
core/autoload/fonts.el
View file

@ -20,10 +20,32 @@ If nil, `doom-font' will be used, scaled up by `doom-big-font-increment'. See
;; ;;
;;; Library ;;; Library
(defun doom--normalize-font (font) ;;;###autoload
(let* ((font (cond ((stringp font) (aref (font-info font) 0)) (defun doom-normalize-font (font)
((fontp font) (font-xlfd-name font)) "Return FONT as a normalized font spec.
((vectorp font) (x-compose-font-name font))))
The font will be normalized (i.e. :weight, :slant, and :width will set to
'normal if not specified) before it is converted.
FONT can be a `font-spec', a font object, an XFT font string, or an XLFD font
string."
(cl-check-type font (or font string vector))
(when (and (stringp font)
(string-prefix-p "-" font))
(setq font (x-decompose-font-name font)))
(let* ((font
(cond ((stringp font)
(dolist (prop '("weight" "slant" "width") (aref (font-info font) 0))
(unless (string-match-p (format ":%s=" prop) font)
(setq font (concat font ":" prop "=normal")))))
((fontp font)
(dolist (prop '(:weight :slant :width) (font-xlfd-name font))
(unless (font-get font prop)
(font-put font prop 'normal))))
((vectorp font)
(dolist (i '(1 2 3) (x-compose-font-name font))
(unless (aref font i)
(aset font i "normal"))))))
(font (x-resolve-font-name font)) (font (x-resolve-font-name font))
(font (font-spec :name font))) (font (font-spec :name font)))
(unless (font-get font :size) (unless (font-get font :size)
@ -64,15 +86,15 @@ Doesn't work in terminal Emacs."
(let* ((original-font (or (symbol-value var) (let* ((original-font (or (symbol-value var)
(face-font face t) (face-font face t)
(with-temp-buffer (face-font face)))) (with-temp-buffer (face-font face))))
(font (doom--normalize-font original-font)) (font (doom-normalize-font original-font))
(dfont (dfont
(or (if-let* ((remap-font (alist-get var font-alist)) (or (if-let* ((remap-font (alist-get var font-alist))
(remap-xlfd (doom--normalize-font remap-font))) (remap-xlfd (doom-normalize-font remap-font)))
remap-xlfd remap-xlfd
(purecopy font)) (purecopy font))
(error "Could not decompose %s font" var)))) (error "Could not decompose %s font" var))))
(let* ((step (if fixed-size-p 0 (* increment doom-font-increment))) (let* ((step (if fixed-size-p 0 (* increment doom-font-increment)))
(orig-size (font-get dfont :size)) (orig-size (font-get font :size))
(new-size (if fixed-size-p increment (+ orig-size step)))) (new-size (if fixed-size-p increment (+ orig-size step))))
(cond ((<= new-size 0) (cond ((<= new-size 0)
(error "`%s' font is too small to be resized (%d)" var new-size)) (error "`%s' font is too small to be resized (%d)" var new-size))
@ -145,8 +167,8 @@ Also resizees `doom-variable-pitch-font' and `doom-serif-font'."
(if doom-big-font (if doom-big-font
;; Use `doom-big-font' in lieu of `doom-font' ;; Use `doom-big-font' in lieu of `doom-font'
(doom-adjust-font-size (doom-adjust-font-size
(if doom-big-font-mode (when doom-big-font-mode
(font-get (doom--normalize-font doom-big-font) :size)) (font-get (doom-normalize-font doom-big-font) :size))
t `((doom-font . ,doom-big-font))) t `((doom-font . ,doom-big-font)))
;; Resize the current font ;; Resize the current font
(doom-adjust-font-size (if doom-big-font-mode doom-big-font-increment)))) (doom-adjust-font-size (if doom-big-font-mode doom-big-font-increment))))