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

Fix multiple tracks in queue being shown as playing (#396)

Browse Source 
* Fix multiple items being shown as playing

* Refactor
This commit is contained in:
André Andersson
2021-01-16 21:40:59 +01:00
committed by GitHub
parent 6e0f00824a
commit d9d6d684ea
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/listview.rs
View File

@@ -269,9 +269,11 @@ impl<I: ListItem> View for ListView<I> {
}); });
} else { } else {
let item = &content[i]; let item = &content[i];
let currently_playing = item.is_playing(self.queue.clone())
&& self.queue.get_current_index() == Some(i);
let style = if self.selected == i { let style = if self.selected == i {
let fg = if item.is_playing(self.queue.clone()) { let fg = if currently_playing {
*printer.theme.palette.custom("playing_selected").unwrap() *printer.theme.palette.custom("playing_selected").unwrap()
} else { } else {
PaletteColor::Tertiary.resolve(&printer.theme.palette) PaletteColor::Tertiary.resolve(&printer.theme.palette)
@@ -280,7 +282,7 @@ impl<I: ListItem> View for ListView<I> {
ColorType::Color(fg), ColorType::Color(fg),
ColorType::Palette(PaletteColor::Highlight), ColorType::Palette(PaletteColor::Highlight),
) )
} else if item.is_playing(self.queue.clone()) { } else if currently_playing {
ColorStyle::new( ColorStyle::new(
ColorType::Color(*printer.theme.palette.custom("playing").unwrap()), ColorType::Color(*printer.theme.palette.custom("playing").unwrap()),
ColorType::Color(*printer.theme.palette.custom("playing_bg").unwrap()), ColorType::Color(*printer.theme.palette.custom("playing_bg").unwrap()),