From d011294c69caa24550ccd6296b78a8d8152be239 Mon Sep 17 00:00:00 2001 From: Ingo Lohmar Date: Sat, 8 Mar 2025 19:20:46 +0100 Subject: [PATCH 1/2] use statusbar.hover style for actual hovering The style was used for regular display of the style_label instead, which gives the current keymap/mode weird prominence, and which means that actual (mouse) hovering needed to use the unrelated "selection" style. This commit uses the hover style for just hovering, or if a mini mode is used (which, to me, sounds at least plausible). For modal-workflow users, it may be more helpful to actually highlight the mode (sometimes?), but I have no experience with that. --- src/tui/status/modestate.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tui/status/modestate.zig b/src/tui/status/modestate.zig index bdca384..46f0783 100644 --- a/src/tui/status/modestate.zig +++ b/src/tui/status/modestate.zig @@ -43,7 +43,7 @@ fn is_overlay_mode() bool { pub fn render(_: *void, self: *Button.State(void), theme: *const Widget.Theme) bool { const style_base = theme.statusbar; - const style_label = if (self.active) theme.editor_cursor else if (self.hover) theme.editor_selection else theme.statusbar_hover; + const style_label = if (self.active) theme.editor_cursor else if (self.hover or is_mini_mode()) theme.statusbar_hover else style_base; self.plane.set_base_style(theme.editor); self.plane.erase(); self.plane.home(); From a5af34e13f826f614153fbd110d202c569df7f30 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 3 Aug 2025 17:40:53 +0200 Subject: [PATCH 2/2] feat: select mode widget style "fancy" or "plain" with descriptor arg "fancy" mode is the previous behaviour and the default. "plain" mode makes the mode widget use the same styling as other status bar widgets. Select "plain" mode with a descriptor arg in the config. e.g: ` bottom_bar "mode:plain file log selection diagnostics keybind branch linenumber clock spacer" ` --- src/tui/status/modestate.zig | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/tui/status/modestate.zig b/src/tui/status/modestate.zig index 46f0783..bc91fcd 100644 --- a/src/tui/status/modestate.zig +++ b/src/tui/status/modestate.zig @@ -12,9 +12,16 @@ const Button = @import("../Button.zig"); const tui = @import("../tui.zig"); const CreateError = @import("widget.zig").CreateError; -pub fn create(allocator: Allocator, parent: Plane, event_handler: ?EventHandler, _: ?[]const u8) CreateError!Widget { - return Button.create_widget(void, allocator, parent, .{ - .ctx = {}, +const Style = enum { + plain, + fancy, +}; +const default_style = .fancy; + +pub fn create(allocator: Allocator, parent: Plane, event_handler: ?EventHandler, arg: ?[]const u8) CreateError!Widget { + const style_ = if (arg) |str_style| std.meta.stringToEnum(Style, str_style) orelse default_style else default_style; + return Button.create_widget(Style, allocator, parent, .{ + .ctx = style_, .label = tui.get_mode(), .on_click = on_click, .on_click2 = toggle_panel, @@ -25,7 +32,7 @@ pub fn create(allocator: Allocator, parent: Plane, event_handler: ?EventHandler, }); } -pub fn layout(_: *void, btn: *Button.State(void)) Widget.Layout { +pub fn layout(_: *Style, btn: *Button.State(Style)) Widget.Layout { const name = btn.plane.egc_chunk_width(tui.get_mode(), 0, 1); const logo = if (is_mini_mode() or is_overlay_mode()) 1 else btn.plane.egc_chunk_width(left ++ symbol ++ right, 0, 1); const padding: usize = 2; @@ -41,9 +48,12 @@ fn is_overlay_mode() bool { return tui.input_mode_outer() != null; } -pub fn render(_: *void, self: *Button.State(void), theme: *const Widget.Theme) bool { +pub fn render(ctx: *Style, self: *Button.State(Style), theme: *const Widget.Theme) bool { const style_base = theme.statusbar; - const style_label = if (self.active) theme.editor_cursor else if (self.hover or is_mini_mode()) theme.statusbar_hover else style_base; + const style_label = switch (ctx.*) { + .fancy => if (self.active) theme.editor_cursor else if (self.hover) theme.editor_selection else theme.statusbar_hover, + .plain => if (self.active) theme.editor_cursor else if (self.hover or is_mini_mode()) theme.statusbar_hover else style_base, + }; self.plane.set_base_style(theme.editor); self.plane.erase(); self.plane.home(); @@ -68,7 +78,7 @@ pub fn render(_: *void, self: *Button.State(void), theme: *const Widget.Theme) b return false; } -fn render_separator(self: *Button.State(void), theme: *const Widget.Theme) void { +fn render_separator(self: *Button.State(Style), theme: *const Widget.Theme) void { self.plane.reverse_style(); self.plane.set_base_style(.{ .bg = theme.editor.bg }); if (theme.statusbar.bg) |bg| self.plane.set_style(.{ .bg = bg }); @@ -79,7 +89,7 @@ const left = " "; const symbol = "󱞏"; const right = " "; -fn render_logo(self: *Button.State(void), theme: *const Widget.Theme, style_label: Widget.Theme.Style) void { +fn render_logo(self: *Button.State(Style), theme: *const Widget.Theme, style_label: Widget.Theme.Style) void { const style_braces: Widget.Theme.Style = if (tui.find_scope_style(theme, "punctuation")) |sty| .{ .fg = sty.style.fg, .bg = style_label.bg, .fs = style_label.fs } else style_label; if (left.len > 0) { self.plane.set_style(style_braces); @@ -93,7 +103,7 @@ fn render_logo(self: *Button.State(void), theme: *const Widget.Theme, style_labe } } -fn on_click(_: *void, _: *Button.State(void)) void { +fn on_click(_: *Style, _: *Button.State(Style)) void { if (is_mini_mode()) { command.executeName("exit_mini_mode", .{}) catch {}; } else if (is_overlay_mode()) { @@ -103,6 +113,6 @@ fn on_click(_: *void, _: *Button.State(void)) void { } } -fn toggle_panel(_: *void, _: *Button.State(void)) void { +fn toggle_panel(_: *Style, _: *Button.State(Style)) void { command.executeName("toggle_panel", .{}) catch {}; }