From 5c114334a8a697885d1acc980ad5c4aabf1d5ddf Mon Sep 17 00:00:00 2001 From: PFiS1737 Date: Mon, 10 Feb 2025 15:55:20 +0800 Subject: [PATCH] feat: enhance statusline separator configuration --- yazi-config/preset/theme-dark.toml | 4 ++-- yazi-config/preset/theme-light.toml | 4 ++-- yazi-config/src/theme/theme.rs | 4 ++-- yazi-plugin/preset/components/status.lua | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yazi-config/preset/theme-dark.toml b/yazi-config/preset/theme-dark.toml index d20753213..d5319b5c1 100644 --- a/yazi-config/preset/theme-dark.toml +++ b/yazi-config/preset/theme-dark.toml @@ -76,8 +76,8 @@ unset_alt = { fg = "red", bg = "gray" } # : Status bar {{{ [status] -separator_open = "" -separator_close = "" +separator_left = [ "", "" ] +separator_right = [ "", "" ] # Progress progress_label = { bold = true } diff --git a/yazi-config/preset/theme-light.toml b/yazi-config/preset/theme-light.toml index e7fd295fd..12821e9f9 100644 --- a/yazi-config/preset/theme-light.toml +++ b/yazi-config/preset/theme-light.toml @@ -76,8 +76,8 @@ unset_alt = { fg = "red", bg = "gray" } # : Status bar {{{ [status] -separator_open = "" -separator_close = "" +separator_left = [ "", "" ] +separator_right = [ "", "" ] # Progress progress_label = { bold = true } diff --git a/yazi-config/src/theme/theme.rs b/yazi-config/src/theme/theme.rs index cb7ddfd33..a929d2e3d 100644 --- a/yazi-config/src/theme/theme.rs +++ b/yazi-config/src/theme/theme.rs @@ -93,8 +93,8 @@ struct Mode { #[derive(Deserialize, Serialize)] struct Status { - pub separator_open: String, - pub separator_close: String, + pub separator_left: (String, String), + pub separator_right: (String, String), // Progress pub progress_label: Style, diff --git a/yazi-plugin/preset/components/status.lua b/yazi-plugin/preset/components/status.lua index d4727bf08..03bbba187 100644 --- a/yazi-plugin/preset/components/status.lua +++ b/yazi-plugin/preset/components/status.lua @@ -40,9 +40,9 @@ function Status:mode() local style = self:style() return ui.Line { - ui.Span(THEME.status.separator_open):fg(style.main.bg), + ui.Span(THEME.status.separator_left[1]):fg(style.main.bg), ui.Span(" " .. mode .. " "):style(style.main), - ui.Span(THEME.status.separator_close):fg(style.main.bg):bg(style.alt.bg), + ui.Span(THEME.status.separator_left[2]):fg(style.main.bg):bg(style.alt.bg), } end @@ -55,7 +55,7 @@ function Status:size() local style = self:style() return ui.Line { ui.Span(" " .. ya.readable_size(h:size() or h.cha.len) .. " "):style(style.alt), - ui.Span(THEME.status.separator_close):fg(style.alt.bg), + ui.Span(THEME.status.separator_left[2]):fg(style.alt.bg), } end @@ -115,7 +115,7 @@ function Status:percent() local style = self:style() return ui.Line { - ui.Span(" " .. THEME.status.separator_open):fg(style.alt.bg), + ui.Span(" " .. THEME.status.separator_right[1]):fg(style.alt.bg), ui.Span(percent):style(style.alt), } end @@ -126,9 +126,9 @@ function Status:position() local style = self:style() return ui.Line { - ui.Span(THEME.status.separator_open):fg(style.main.bg):bg(style.alt.bg), + ui.Span(THEME.status.separator_right[1]):fg(style.main.bg):bg(style.alt.bg), ui.Span(string.format(" %2d/%-2d ", math.min(cursor + 1, length), length)):style(style.main), - ui.Span(THEME.status.separator_close):fg(style.main.bg), + ui.Span(THEME.status.separator_right[2]):fg(style.main.bg), } end