mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: rename field

Browse source
This commit is contained in:
Pig Fang 2023-08-07 18:18:42 +08:00
parent 319b06a4be
commit 91a4bd93cc
No known key found for this signature in database
GPG key ID: A8198F548DADA9E2
4 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/status/left.rs
View file

@ -25,7 +25,7 @@ impl<'a> Widget for Left<'a> {
let mut spans = vec![]; let mut spans = vec![];
// Mode // Mode
spans.push(Span::styled(&THEME.status.section_separator.left, primary.fg())); spans.push(Span::styled(&THEME.status.separator.opening, primary.fg()));
spans.push(Span::styled( spans.push(Span::styled(
format!(" {mode} "), format!(" {mode} "),
primary.bg().fg(**secondary).add_modifier(Modifier::BOLD), primary.bg().fg(**secondary).add_modifier(Modifier::BOLD),
@ -35,7 +35,7 @@ impl<'a> Widget for Left<'a> {
// Length // Length
if let Some(len) = h.length { if let Some(len) = h.length {
spans.push(Span::styled(format!(" {} ", readable_size(len)), body.bg().fg(**primary))); spans.push(Span::styled(format!(" {} ", readable_size(len)), body.bg().fg(**primary)));
spans.push(Span::styled(&THEME.status.section_separator.right, body.fg())); spans.push(Span::styled(&THEME.status.separator.closing, body.fg()));
} }
// Filename // Filename

4
app/src/status/right.rs
View file

@ -47,7 +47,7 @@ impl<'a> Right<'a> {
vec![ vec![
Span::raw(" "), Span::raw(" "),
Span::styled(&THEME.status.section_separator.left, body.fg()), Span::styled(&THEME.status.separator.opening, body.fg()),
Span::styled( Span::styled(
if percent == 0 { " Top ".to_string() } else { format!(" {:>3}% ", percent) }, if percent == 0 { " Top ".to_string() } else { format!(" {:>3}% ", percent) },
body.bg().fg(**primary), body.bg().fg(**primary),
@ -56,7 +56,7 @@ impl<'a> Right<'a> {
format!(" {:>2}/{:<2} ", (cursor + 1).min(length), length), format!(" {:>2}/{:<2} ", (cursor + 1).min(length), length),
primary.bg().fg(**secondary), primary.bg().fg(**secondary),
), ),
Span::styled(&THEME.status.section_separator.right, primary.fg()), Span::styled(&THEME.status.separator.closing, primary.fg()),
] ]
} }
} }

20
config/preset/theme.toml
View file

@ -3,16 +3,16 @@ active = { fg = "#1E2031", bg = "#80AEFA" }
inactive = { fg = "#C8D3F8", bg = "#484D66" } inactive = { fg = "#C8D3F8", bg = "#484D66" }
[status] [status]
primary = { normal = "#80AEFA", select = "#CD9EFC", unset = "#FFA577" } primary = { normal = "#80AEFA", select = "#CD9EFC", unset = "#FFA577" }
secondary = { normal = "#1E2031", select = "#23273B", unset = "#23273B" } secondary = { normal = "#1E2031", select = "#23273B", unset = "#23273B" }
tertiary = { normal = "#6D738F", select = "#6D738F", unset = "#6D738F" } tertiary = { normal = "#6D738F", select = "#6D738F", unset = "#6D738F" }
body = { normal = "#484D66", select = "#484D66", unset = "#484D66" } body = { normal = "#484D66", select = "#484D66", unset = "#484D66" }
emphasis = { normal = "#C8D3F8", select = "#C8D3F8", unset = "#C8D3F8" } emphasis = { normal = "#C8D3F8", select = "#C8D3F8", unset = "#C8D3F8" }
info = { normal = "#7AD9E5", select = "#7AD9E5", unset = "#7AD9E5" } info = { normal = "#7AD9E5", select = "#7AD9E5", unset = "#7AD9E5" }
success = { normal = "#97DC8D", select = "#97DC8D", unset = "#97DC8D" } success = { normal = "#97DC8D", select = "#97DC8D", unset = "#97DC8D" }
warning = { normal = "#F3D398", select = "#F3D398", unset = "#F3D398" } warning = { normal = "#F3D398", select = "#F3D398", unset = "#F3D398" }
danger = { normal = "#FA7F94", select = "#FA7F94", unset = "#FA7F94" } danger = { normal = "#FA7F94", select = "#FA7F94", unset = "#FA7F94" }
section_separator = { left = "", right = "" } separator = { opening = "", closing = "" }
[progress] [progress]
gauge = { fg = "#FFA577", bg = "#484D66" } gauge = { fg = "#FFA577", bg = "#484D66" }

24
config/src/theme/theme.rs
View file

@ -14,22 +14,22 @@ pub struct Tab {
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct Status { pub struct Status {
pub primary: ColorGroup, pub primary: ColorGroup,
pub secondary: ColorGroup, pub secondary: ColorGroup,
pub tertiary: ColorGroup, pub tertiary: ColorGroup,
pub body: ColorGroup, pub body: ColorGroup,
pub emphasis: ColorGroup, pub emphasis: ColorGroup,
pub info: ColorGroup, pub info: ColorGroup,
pub success: ColorGroup, pub success: ColorGroup,
pub warning: ColorGroup, pub warning: ColorGroup,
pub danger: ColorGroup, pub danger: ColorGroup,
pub section_separator: SectionSeparator, pub separator: SectionSeparator,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct SectionSeparator { pub struct SectionSeparator {
pub left: String, pub opening: String,
pub right: String, pub closing: String,
} }
#[derive(Deserialize)] #[derive(Deserialize)]