summaryrefslogtreecommitdiffhomepage
path: root/lib/themes/jao-themes.el
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2025-09-20 22:54:36 +0100
committerjao <jao@gnu.org>2025-09-20 22:54:36 +0100
commite57fe68659662daa08997df59189fb5d4608a5ca (patch)
treee18a8c1f2bfbc5045bb169cf55fd426e61bb97cf /lib/themes/jao-themes.el
parenta0e65b40f6a923122355c876983ecb8e3b799c2c (diff)
downloadelibs-e57fe68659662daa08997df59189fb5d4608a5ca.tar.gz
elibs-e57fe68659662daa08997df59189fb5d4608a5ca.tar.bz2
theme tweaksmain
Diffstat (limited to 'lib/themes/jao-themes.el')
-rw-r--r--lib/themes/jao-themes.el17
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index efb691c..d05583a 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -23,8 +23,12 @@
;;; palette
(defvar jao-themes-default-face nil)
(defvar jao-themes-default-family "Hack")
+(defvar jao-themes-default-variable-pitch-size 9)
+(defvar jao-themes-default-variable-pitch-family "Hack")
(defvar jao-themes-default-size 9)
(defvar jao-themes--face-family jao-themes-default-face)
+(defvar jao-themes--variable-pitch-family nil)
+(defvar jao-themes--variable-pitch-height nil)
(defvar jao-themes--fg "black")
(defvar jao-themes--bg "white")
(defvar jao-themes--box "grey75")
@@ -1111,7 +1115,7 @@
(twittering-uri-face (~ link))
(twittering-username-face (p f01)))
`((underline ul))
- `((variable-pitch :family ,jao-themes--face-family)
+ `((variable-pitch :family ,jao-themes--variable-pitch-family)
(variable-pitch-text (~ variable-pitch))
(vertical-border (c ,jao-themes--box nil) :inherit default)
(vertico-current (p hilite))
@@ -1234,19 +1238,28 @@
jao-themes-default-family))
(size (or (cadr (assoc :face-size args))
jao-themes-default-size))
+ (vpitch (or (cadr (assoc :variable-pitch-family args))
+ jao-themes-default-variable-pitch-family))
+ (vsize (or (cadr (assoc :variable-pitch-size args))
+ jao-themes-default-variable-pitch-size))
(bw (or (cadr (assoc :bold-weight args)) jao-themes--bold-weight)))
`(progn
(custom-make-theme-feature ',name)
(deftheme ,name)
(custom-theme-set-variables ',name
'(jao-themes-default-face
- (format "%s-%s" ,family ,size))
+ ,(format "%s-%s" family size))
'(jao-themes--face-family ,family)
+ '(jao-themes--variable-pitch-family
+ ,vpitch)
+ '(jao-themes--variable-pitch-height
+ ,(* 10 vsize))
'(jao-themes--bold-weight ,bw))
(let ((*jao-themes--color-names* ',(cdr (assoc :names args)))
(jao-themes--face-family ,family))
(let* ,(jao-themes--let-palette palette)
(jao-themes--set-fbg 'x)
+ (jao-themes--set-fbg 'ns)
(jao-themes--set-fbg 'pgtk)
(let* ((xfaces (jao-themes--make-faces ',x-faces ',x-colors))
(tx-faces (jao-themes--extract-faces xfaces xfaces)))