lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak progress bar style

Browse Source
This commit is contained in:
KoffeinFlummi
2019-03-31 21:40:32 +02:00
parent 626ee79654
commit d2dc2f0ecc
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.rs
View File

@@ -26,6 +26,7 @@ pub struct ConfigTheme {
pub error: Option<String>, pub error: Option<String>,
pub error_bg: Option<String>, pub error_bg: Option<String>,
pub statusbar_progress: Option<String>, pub statusbar_progress: Option<String>,
pub statusbar_progress_bg: Option<String>,
pub statusbar: Option<String>, pub statusbar: Option<String>,
pub statusbar_bg: Option<String>, pub statusbar_bg: Option<String>,
pub cmdline: Option<String>, pub cmdline: Option<String>,

4
src/theme.rs
View File

@@ -34,6 +34,10 @@ pub fn load(cfg: &Config) -> Theme {
"statusbar_progress", "statusbar_progress",
load_color!(cfg, statusbar_progress, Dark(Blue)), load_color!(cfg, statusbar_progress, Dark(Blue)),
); );
palette.set_color(
"statusbar_progress_bg",
load_color!(cfg, statusbar_progress_bg, Light(Black)),
);
palette.set_color("statusbar", load_color!(cfg, statusbar, Dark(Yellow))); palette.set_color("statusbar", load_color!(cfg, statusbar, Dark(Yellow)));
palette.set_color( palette.set_color(
"statusbar_bg", "statusbar_bg",

15
src/ui/statusbar.rs
View File

@@ -39,6 +39,10 @@ impl View for StatusBar {
ColorType::Color(*printer.theme.palette.custom("statusbar_progress").unwrap()), ColorType::Color(*printer.theme.palette.custom("statusbar_progress").unwrap()),
ColorType::Palette(PaletteColor::Background), ColorType::Palette(PaletteColor::Background),
); );
let style_bar_bg = ColorStyle::new(
ColorType::Color(*printer.theme.palette.custom("statusbar_progress_bg").unwrap()),
ColorType::Palette(PaletteColor::Background),
);
let style = ColorStyle::new( let style = ColorStyle::new(
ColorType::Color(*printer.theme.palette.custom("statusbar").unwrap()), ColorType::Color(*printer.theme.palette.custom("statusbar").unwrap()),
ColorType::Color(*printer.theme.palette.custom("statusbar_bg").unwrap()), ColorType::Color(*printer.theme.palette.custom("statusbar_bg").unwrap()),
@@ -100,6 +104,10 @@ impl View for StatusBar {
} }
.to_string(); .to_string();
printer.with_color(style_bar_bg, |printer| {
printer.print((0, 0), &"┉".repeat(printer.size.x));
});
if let Some(ref t) = self.queue.get_current() { if let Some(ref t) = self.queue.get_current() {
let elapsed = self.spotify.get_current_progress(); let elapsed = self.spotify.get_current_progress();
let elapsed_ms = elapsed.as_secs() as u32 * 1000 + elapsed.subsec_millis(); let elapsed_ms = elapsed.as_secs() as u32 * 1000 + elapsed.subsec_millis();
@@ -120,9 +128,8 @@ impl View for StatusBar {
}); });
printer.with_color(style_bar, |printer| { printer.with_color(style_bar, |printer| {
printer.print((0, 0), &"—".repeat(printer.size.x));
let duration_width = (((printer.size.x as u32) * elapsed_ms) / t.duration) as usize; let duration_width = (((printer.size.x as u32) * elapsed_ms) / t.duration) as usize;
printer.print((0, 0), &format!("{}{}", "=".repeat(duration_width), ">")); printer.print((0, 0), &"━".repeat(duration_width + 1));
}); });
} else { } else {
let right = repeat + &shuffle; let right = repeat + &shuffle;
@@ -131,10 +138,6 @@ impl View for StatusBar {
printer.with_color(style, |printer| { printer.with_color(style, |printer| {
printer.print((offset, 1), &right); printer.print((offset, 1), &right);
}); });
printer.with_color(style_bar, |printer| {
printer.print((0, 0), &"—".repeat(printer.size.x));
});
} }
} }