From 457bdcb6767c695b8e28eb984c585cfbec0c3933 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 25 Nov 2024 23:01:41 -0800 Subject: [PATCH] Normalize and grow title bar, remove side bars Remove side bars, make all the sizes of the title bar a little more rounded. --- theme.jl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/theme.jl b/theme.jl index 1e8fde8..b11869e 100644 --- a/theme.jl +++ b/theme.jl @@ -2,31 +2,31 @@ ;; Author : Tom Willemse ;; License : GPL-3+ -(let* ((default-frame - `(((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . -4) (width . 30) (height . 26) (text . "×") (x-justify . center) (y-justify . center) (top-edge . -26) (class . close-button)) - ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 26) (width . 26) (height . 26) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . -26) (class . maximize-button)) - ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 51) (width . 26) (height . 26) (text . "_") (x-justify . center) (y-justify . center) (top-edge . -26) (class . iconify-button)) - ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (left-edge . -4) (width . 21) (height . 26) (top-edge . -26) (class . menu-button) (text . "⮟") (x-justify . center) (y-justify . center)) - ((background . ("#222424")) (right-edge . -5) (width . 5) (top-edge . 0) (bottom-edge . 0) (class . right-border)) - ((background . ("#222424")) (left-edge . -5) (width . 5) (top-edge . 0) (bottom-edge . 0) (class . left-border)) - ((background . ("#111414")) (right-edge . 0) (left-edge . 0) (height . 5) (bottom-edge . -5) (class . bottom-border)) - ((background . ("#111414")) (left-edge . -5) (width . 5) (height . 5) (bottom-edge . -5) (class . bottom-left-corner)) - ((background . ("#111414")) (right-edge . -5) (width . 5) (height . 5) (bottom-edge . -5) (class . bottom-right-corner)) +(let* ((button-width 30) + (title-height button-width) + (default-frame + `(((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 0) (width . ,button-width) (height . ,title-height) (text . "×") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . close-button)) + ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . ,button-width) (width . ,button-width) (height . ,title-height) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . maximize-button)) + ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . ,(* 2 button-width)) (width . ,button-width) (height . ,button-width) (text . "_") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . iconify-button)) + ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (left-edge . 0) (width . ,button-width) (height . ,title-height) (top-edge . ,(- title-height)) (class . menu-button) (text . "⮟") (x-justify . center) (y-justify . center)) + ((background . ("#111414")) (right-edge . 5) (left-edge . 5) (height . 5) (bottom-edge . -5) (class . bottom-border)) + ((background . ("#111414")) (left-edge . 0) (width . 5) (height . 5) (bottom-edge . -5) (class . bottom-left-corner)) + ((background . ("#111414")) (right-edge . 0) (width . 5) (height . 5) (bottom-edge . -5) (class . bottom-right-corner)) - ((background . ("#111414")) (right-edge . 77) (left-edge . 17) (height . 26) (top-edge . -26) + ((background . ("#111414")) (right-edge . ,(* 3 button-width)) (left-edge . ,button-width) (height . ,title-height) (top-edge . ,(- title-height)) (foreground . ("#bfbfbf" "#ff9800")) (text . ,window-name) (x-justify . center) (y-justify . center) (class . title)))) (shaded-frame - `(((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . -4) (width . 30) (height . 26) (text . "×") (x-justify . center) (y-justify . center) (top-edge . -26) (class . close-button)) - ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 26) (width . 26) (height . 26) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . -26) (class . maximize-button)) - ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 51) (width . 26) (height . 26) (text . "_") (x-justify . center) (y-justify . center) (top-edge . -26) (class . iconify-button)) - ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (left-edge . -4) (width . 21) (height . 26) (top-edge . -26) (class . menu-button) (text . "⮝") (x-justify . center) (y-justify . center)) + `(((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 0) (width . ,button-width) (height . ,title-height) (text . "×") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . close-button)) + ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . ,button-width) (width . ,button-width) (height . ,title-height) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . maximize-button)) + ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . ,(* 2 button-width)) (width . ,button-width) (height . ,title-height) (text . "_") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . iconify-button)) + ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (left-edge . 0) (width . ,button-width) (height . ,title-height) (top-edge . ,(- title-height)) (class . menu-button) (text . "⮝") (x-justify . center) (y-justify . center)) - ((background . ("#111414")) (right-edge . 77) (left-edge . 17) (height . 26) (top-edge . -26) + ((background . ("#111414")) (right-edge . ,(* 3 button-width)) (left-edge . ,button-width) (height . ,title-height) (top-edge . ,(- title-height)) (foreground . ("#bfbfbf" "#ff9800")) (text . ,window-name) (x-justify . center) (y-justify . center) (class . title))))) (add-frame-style 'yoshi (lambda (w type) (case type + ((default) default-frame) ((shaped) shaded-frame) - ((shaped-transient) shaded-frame) - (t default-frame))))) + ((shaped-transient) shaded-frame)))))