diff --git a/src/config.zig b/src/config.zig index 72f4988..60993d8 100644 --- a/src/config.zig +++ b/src/config.zig @@ -37,7 +37,6 @@ top_bar: []const u8 = "tabs", bottom_bar: []const u8 = "mode file log selection diagnostics keybind branch linenumber clock spacer", show_scrollbars: bool = true, show_fileicons: bool = true, -scrollbar_auto_hide: bool = false, start_debugger_on_crash: bool = false, @@ -47,7 +46,6 @@ panel_style: WidgetStyle = .compact, home_style: WidgetStyle = .bars_top_bottom, pane_left_style: WidgetStyle = .bar_right, pane_right_style: WidgetStyle = .bar_left, -pane_style: PaneStyle = .panel, centered_view: bool = false, centered_view_width: usize = 145, @@ -127,8 +125,3 @@ pub const CursorShape = enum { beam_blink, beam, }; - -pub const PaneStyle = enum { - panel, - editor, -}; diff --git a/src/tui/WidgetStyle.zig b/src/tui/WidgetStyle.zig index 99cd19e..fd5e713 100644 --- a/src/tui/WidgetStyle.zig +++ b/src/tui/WidgetStyle.zig @@ -3,7 +3,6 @@ border: Border = Border.blank, pub const WidgetType = @import("config").WidgetType; pub const WidgetStyle = @import("config").WidgetStyle; -pub const tui = @import("tui.zig"); pub const Padding = struct { pub const Unit = u16; @@ -152,13 +151,7 @@ pub fn theme_style_from_type(style_type: WidgetType, theme: *const Theme) Theme. .palette => .{ .fg = theme.editor_widget_border.fg, .bg = theme.editor_widget.bg }, .panel => .{ .fg = theme.editor_widget_border.fg, .bg = theme.editor.bg }, .home => .{ .fg = theme.editor_widget_border.fg, .bg = theme.editor.bg }, - .pane_left => switch (tui.config().pane_style) { - .panel => .{ .fg = theme.editor_widget.bg, .bg = theme.panel.bg }, - .editor => .{ .fg = theme.editor_widget.bg, .bg = theme.editor.bg }, - }, - .pane_right => switch (tui.config().pane_style) { - .panel => .{ .fg = theme.editor_widget.bg, .bg = theme.panel.bg }, - .editor => .{ .fg = theme.editor_widget.bg, .bg = theme.editor.bg }, - }, + .pane_left => .{ .fg = theme.editor_widget.bg, .bg = theme.panel.bg }, + .pane_right => .{ .fg = theme.editor_widget.bg, .bg = theme.panel.bg }, }; } diff --git a/src/tui/scrollbar_v.zig b/src/tui/scrollbar_v.zig index d307bcd..306521e 100644 --- a/src/tui/scrollbar_v.zig +++ b/src/tui/scrollbar_v.zig @@ -6,7 +6,6 @@ const Plane = @import("renderer").Plane; const input = @import("input"); const EventHandler = @import("EventHandler"); -const tui = @import("tui.zig"); const Widget = @import("Widget.zig"); plane: Plane, @@ -129,8 +128,7 @@ pub fn render(self: *Self, theme: *const Widget.Theme) bool { defer frame.deinit(); self.plane.set_base_style(style); self.plane.erase(); - if (!(tui.config().scrollbar_auto_hide and self.size_scrn == self.view_scrn)) - smooth_bar_at(&self.plane, @intCast(self.pos_scrn), @intCast(self.view_scrn)) catch {}; + smooth_bar_at(&self.plane, @intCast(self.pos_scrn), @intCast(self.view_scrn)) catch {}; return false; }