diff --git a/app/src/status/left.rs b/app/src/status/left.rs index 0ed7484c..e9c34d78 100644 --- a/app/src/status/left.rs +++ b/app/src/status/left.rs @@ -22,10 +22,12 @@ impl<'a> Widget for Left<'a> { let secondary = mode.color(&THEME.status.secondary); let body = mode.color(&THEME.status.body); - let mut spans = vec![]; + // Separator + let separator = &THEME.status.separator; // Mode - spans.push(Span::styled(&THEME.status.separator.opening, primary.fg())); + let mut spans = vec![]; + spans.push(Span::styled(&separator.opening, primary.fg())); spans.push(Span::styled( format!(" {mode} "), primary.bg().fg(**secondary).add_modifier(Modifier::BOLD), @@ -35,7 +37,7 @@ impl<'a> Widget for Left<'a> { // Length if let Some(len) = h.length { spans.push(Span::styled(format!(" {} ", readable_size(len)), body.bg().fg(**primary))); - spans.push(Span::styled(&THEME.status.separator.closing, body.fg())); + spans.push(Span::styled(&separator.closing, body.fg())); } // Filename diff --git a/app/src/status/right.rs b/app/src/status/right.rs index 8553f953..ef415ba6 100644 --- a/app/src/status/right.rs +++ b/app/src/status/right.rs @@ -41,13 +41,16 @@ impl<'a> Right<'a> { let secondary = mode.color(&THEME.status.secondary); let body = mode.color(&THEME.status.body); + // Separator + let separator = &THEME.status.separator; + let cursor = self.cx.manager.current().cursor(); let length = self.cx.manager.current().files.len(); let percent = if cursor == 0 || length == 0 { 0 } else { (cursor + 1) * 100 / length }; vec![ Span::raw(" "), - Span::styled(&THEME.status.separator.opening, body.fg()), + Span::styled(&separator.opening, body.fg()), Span::styled( if percent == 0 { " Top ".to_string() } else { format!(" {:>3}% ", percent) }, body.bg().fg(**primary), @@ -56,7 +59,7 @@ impl<'a> Right<'a> { format!(" {:>2}/{:<2} ", (cursor + 1).min(length), length), primary.bg().fg(**secondary), ), - Span::styled(&THEME.status.separator.closing, primary.fg()), + Span::styled(&separator.closing, primary.fg()), ] } } diff --git a/config/src/theme/theme.rs b/config/src/theme/theme.rs index e4084eab..8b8adf19 100644 --- a/config/src/theme/theme.rs +++ b/config/src/theme/theme.rs @@ -23,11 +23,11 @@ pub struct Status { pub success: ColorGroup, pub warning: ColorGroup, pub danger: ColorGroup, - pub separator: SectionSeparator, + pub separator: StatusSeparator, } #[derive(Deserialize)] -pub struct SectionSeparator { +pub struct StatusSeparator { pub opening: String, pub closing: String, }