From 2e048c870c07d8d0df31efbacb4891676216b408 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Sat, 28 Dec 2024 15:57:01 -0600 Subject: [PATCH 1/2] apprt/gtk: style the tab overview when window-theme=ghostty This requires libadwaita main (to be 1.8). Signed-off-by: Tristan Partin --- src/apprt/gtk/App.zig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig index 21df3321f..e2f77806e 100644 --- a/src/apprt/gtk/App.zig +++ b/src/apprt/gtk/App.zig @@ -990,6 +990,8 @@ fn loadRuntimeCss( \\ --headerbar-fg-color: rgb({d},{d},{d}); \\ --headerbar-bg-color: rgb({d},{d},{d}); \\ --headerbar-backdrop-color: oklab(from var(--headerbar-bg-color) calc(l * 0.9) a b / alpha); + \\ --overview-fg-color: rgb({d},{d},{d}); + \\ --overview-bg-color: rgb({d},{d},{d}); \\ --popover-fg-color: rgb({d},{d},{d}); \\ --popover-bg-color: rgb({d},{d},{d}); \\}} @@ -1013,6 +1015,12 @@ fn loadRuntimeCss( headerbar_background.r, headerbar_background.g, headerbar_background.b, + headerbar_foreground.r, + headerbar_foreground.g, + headerbar_foreground.b, + headerbar_background.r, + headerbar_background.g, + headerbar_background.b, }), else => {}, } From c20fe23946bca1f0db481a874d771a944b71cc65 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Sun, 29 Dec 2024 12:06:46 -0600 Subject: [PATCH 2/2] apprt/gtk: use CSS variables to deduplicate code Signed-off-by: Tristan Partin --- src/apprt/gtk/App.zig | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig index e2f77806e..033f4788c 100644 --- a/src/apprt/gtk/App.zig +++ b/src/apprt/gtk/App.zig @@ -987,13 +987,15 @@ fn loadRuntimeCss( switch (window_theme) { .ghostty => try writer.print( \\:root {{ - \\ --headerbar-fg-color: rgb({d},{d},{d}); - \\ --headerbar-bg-color: rgb({d},{d},{d}); + \\ --ghostty-fg: rgb({d},{d},{d}); + \\ --ghostty-bg: rgb({d},{d},{d}); + \\ --headerbar-fg-color: var(--ghostty-fg); + \\ --headerbar-bg-color: var(--ghostty-bg); \\ --headerbar-backdrop-color: oklab(from var(--headerbar-bg-color) calc(l * 0.9) a b / alpha); - \\ --overview-fg-color: rgb({d},{d},{d}); - \\ --overview-bg-color: rgb({d},{d},{d}); - \\ --popover-fg-color: rgb({d},{d},{d}); - \\ --popover-bg-color: rgb({d},{d},{d}); + \\ --overview-fg-color: var(--ghostty-fg); + \\ --overview-bg-color: var(--ghostty-bg); + \\ --popover-fg-color: var(--ghostty-fg); + \\ --popover-bg-color: var(--ghostty-bg); \\}} \\windowhandle {{ \\ background-color: var(--headerbar-bg-color); @@ -1009,18 +1011,6 @@ fn loadRuntimeCss( headerbar_background.r, headerbar_background.g, headerbar_background.b, - headerbar_foreground.r, - headerbar_foreground.g, - headerbar_foreground.b, - headerbar_background.r, - headerbar_background.g, - headerbar_background.b, - headerbar_foreground.r, - headerbar_foreground.g, - headerbar_foreground.b, - headerbar_background.r, - headerbar_background.g, - headerbar_background.b, }), else => {}, }