1 files changed, 19 insertions, 12 deletions

@@ -234,18 +234,25 @@
       scroll-preserve-screen-position 1)
 
 ;; Fonts
-(set-face-attribute 'default nil
-                    :font (pcase acdw/system
-                            (:home "DejaVu Sans Mono-10")
-                            (:work "Consolas-10")
-                            (:other "monospace-10")))
-(set-face-attribute 'fixed-pitch nil
-                    :inherit 'default)
-(set-face-attribute 'variable-pitch nil
-                    :font (pcase acdw/system
-                            (:home "DejaVu Sans")
-                            (:work "Calibri-11")
-                            (:other "sans-serif")))
+;; Load them /after/ the first frame comes into focus
+(add-function :after after-focus-change-function
+              (defun hook--setup-fonts ()
+                (dolist (face '(default fixed-pitch))
+                  ;; `default' and `fixed-pitch' should be the same.
+                  (set-face-attribute face nil
+                                      :font (pcase acdw/system
+                                              (:home "DejaVu Sans Mono-10")
+                                              (:work "Consolas-10")
+                                              (:other "monospace-10"))))
+                ;; `variable-pitch' is, of course, different.
+                (set-face-attribute 'variable-pitch nil
+                                    :font (pcase acdw/system
+                                            (:home "DejaVu Sans")
+                                            (:work "Calibri-11")
+                                            (:other "sans-serif")))
+                (remove-function after-focus-change-function
+                                 'hook--setup-fonts)))
+
 
 ;; MS Windows
 (setc w32-allow-system-shell t