From 43c897141f56ef9c8780f8b85410d897e2ccca3f Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Sat, 25 Jan 2025 21:46:54 +0100
Subject: [PATCH] feat(tabs): use tabs styles from theme

---
 build.zig.zon           |  4 +--
 src/tui/status/tabs.zig | 69 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index 577381e..8fba320 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -22,8 +22,8 @@
             .hash = "1220042d96513aec54ec3c78dcb28e2529d5f45d0c37bf676860f77f26dce590f9f8",
         },
         .themes = .{
-            .url = "https://github.com/neurocyte/flow-themes/releases/download/master-770924d1aba9cc33440b66e865bd4f7dca871074/flow-themes.tar.gz",
-            .hash = "12209c54177d215ecf7a5b7bf3c51be85ac3b3a451f9c2a58b8d4bbb378b45effbba",
+            .url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz",
+            .hash = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b",
         },
         .fuzzig = .{
             .url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz",
diff --git a/src/tui/status/tabs.zig b/src/tui/status/tabs.zig
index 641a9cc..5ec0809 100644
--- a/src/tui/status/tabs.zig
+++ b/src/tui/status/tabs.zig
@@ -67,7 +67,7 @@ const TabBar = struct {
         self.plane.set_base_style(theme.editor);
         self.plane.erase();
         self.plane.home();
-        self.plane.set_style(theme.statusbar);
+        self.plane.set_style(theme.tab_inactive);
         self.plane.fill(" ");
         self.plane.home();
         return self.widget_list_widget.render(theme);
@@ -117,7 +117,7 @@ const TabBar = struct {
             if (first) {
                 first = false;
             } else {
-                try self.widget_list.add(try self.make_spacer(1));
+                try self.widget_list.add(try self.make_spacer());
             }
             try self.widget_list.add(tab.widget);
         }
@@ -154,8 +154,8 @@ const TabBar = struct {
         self.tabs = try result.toOwnedSlice(self.allocator);
     }
 
-    fn make_spacer(self: @This(), comptime size: usize) !Widget {
-        return @import("blank.zig").Create(.{ .static = size })(self.allocator, self.widget_list.plane, null);
+    fn make_spacer(self: @This()) !Widget {
+        return spacer.create(self.allocator, self.widget_list.plane, null);
     }
 
     fn select_next_tab(self: *Self) void {
@@ -227,13 +227,15 @@ const Tab = struct {
     }
 
     fn render_active(self: *@This(), btn: *Button.State(@This()), theme: *const Widget.Theme) bool {
-        btn.plane.set_base_style(theme.statusbar);
+        btn.plane.set_base_style(theme.editor);
         btn.plane.erase();
         btn.plane.home();
-        btn.plane.set_style(theme.editor);
+        btn.plane.set_style(theme.tab_inactive);
+        btn.plane.fill(" ");
+        btn.plane.home();
+        btn.plane.set_style(theme.tab_active);
         btn.plane.fill(" ");
         btn.plane.home();
-        btn.plane.set_style(theme.editor);
         return self.render_content(btn);
     }
 
@@ -241,9 +243,14 @@ const Tab = struct {
         btn.plane.set_base_style(theme.editor);
         btn.plane.erase();
         btn.plane.home();
-        btn.plane.set_style(if (btn.hover) theme.statusbar_hover else theme.statusbar);
+        btn.plane.set_style(theme.tab_inactive);
         btn.plane.fill(" ");
         btn.plane.home();
+        if (btn.hover) {
+            btn.plane.set_style(theme.tab_selected);
+            btn.plane.fill(" ");
+            btn.plane.home();
+        }
         return self.render_content(btn);
     }
 
@@ -273,3 +280,49 @@ const Tab = struct {
         return basename;
     }
 };
+
+const spacer = struct {
+    plane: Plane,
+    layout: Widget.Layout,
+    on_event: ?EventHandler,
+
+    const Self = @This();
+
+    fn create(allocator: std.mem.Allocator, parent: Plane, event_handler: ?EventHandler) @import("widget.zig").CreateError!Widget {
+        const self: *Self = try allocator.create(Self);
+        self.* = .{
+            .plane = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent),
+            .layout = .{ .static = 1 },
+            .on_event = event_handler,
+        };
+        return Widget.to(self);
+    }
+
+    pub fn deinit(self: *Self, allocator: std.mem.Allocator) void {
+        self.plane.deinit();
+        allocator.destroy(self);
+    }
+
+    pub fn layout(self: *Self) Widget.Layout {
+        return self.layout;
+    }
+
+    pub fn render(self: *Self, theme: *const Widget.Theme) bool {
+        self.plane.set_base_style(theme.editor);
+        self.plane.erase();
+        self.plane.home();
+        self.plane.set_style(theme.tab_inactive);
+        self.plane.fill(" ");
+        self.plane.home();
+        return false;
+    }
+
+    pub fn receive(self: *Self, from: tp.pid_ref, m: tp.message) error{Exit}!bool {
+        var btn: u32 = 0;
+        if (try m.match(.{ "D", tp.any, tp.extract(&btn), tp.more })) {
+            if (self.on_event) |h| h.send(from, m) catch {};
+            return true;
+        }
+        return false;
+    }
+};