|
|
|
|
@ -112,6 +112,8 @@ void setProperties(NC::Menu<T> &menu, const MPD::Song &s, const SongList &list, |
|
|
|
|
&& song_pos == Status::State::currentSongPosition(); |
|
|
|
|
if (is_now_playing) |
|
|
|
|
menu << Config.now_playing_prefix; |
|
|
|
|
else |
|
|
|
|
menu << Config.not_playing_prefix; |
|
|
|
|
|
|
|
|
|
is_in_playlist = !myPlaylist->isActiveWindow(menu) |
|
|
|
|
&& myPlaylist->checkForSong(s); |
|
|
|
|
@ -131,6 +133,8 @@ void unsetProperties(NC::Menu<T> &menu, bool separate_albums, bool is_now_playin |
|
|
|
|
|
|
|
|
|
if (is_now_playing) |
|
|
|
|
menu << Config.now_playing_suffix; |
|
|
|
|
else |
|
|
|
|
menu << Config.not_playing_suffix; |
|
|
|
|
|
|
|
|
|
if (separate_albums) |
|
|
|
|
menu << NC::Format::NoUnderline; |
|
|
|
|
@ -160,6 +164,8 @@ void showSongs(NC::Menu<T> &menu, const MPD::Song &s, const SongList &list, cons |
|
|
|
|
} |
|
|
|
|
if (is_now_playing) |
|
|
|
|
x_off -= Config.now_playing_suffix_length; |
|
|
|
|
else |
|
|
|
|
x_off -= Config.not_playing_suffix_length; |
|
|
|
|
if (is_selected) |
|
|
|
|
x_off -= Config.selected_item_suffix_length; |
|
|
|
|
menu << NC::TermManip::ClearToEOL << NC::XY(x_off, y) << right_aligned; |
|
|
|
|
@ -193,9 +199,14 @@ void showSongsInColumns(NC::Menu<T> &menu, const MPD::Song &s, const SongList &l |
|
|
|
|
} |
|
|
|
|
if (is_now_playing) |
|
|
|
|
{ |
|
|
|
|
menu_width -= Config.now_playing_prefix_length; |
|
|
|
|
menu_width -= Config.now_playing_suffix_length; |
|
|
|
|
// menu_width -= Config.now_playing_prefix_length;
|
|
|
|
|
//menu_width -= Config.now_playing_suffix_length;
|
|
|
|
|
} else |
|
|
|
|
{ |
|
|
|
|
//menu_width -= Config.not_playing_prefix_length;
|
|
|
|
|
//menu_width -= Config.not_playing_suffix_length;
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (is_selected) |
|
|
|
|
{ |
|
|
|
|
menu_width -= Config.selected_item_prefix_length; |
|
|
|
|
@ -277,6 +288,8 @@ std::string Display::Columns(size_t list_width) |
|
|
|
|
if (Config.columns.empty()) |
|
|
|
|
return result; |
|
|
|
|
|
|
|
|
|
result += Config.not_playing_prefix.str(); |
|
|
|
|
|
|
|
|
|
int width; |
|
|
|
|
int remained_width = list_width; |
|
|
|
|
std::vector<Column>::const_iterator it, last = Config.columns.end() - 1; |
|
|
|
|
|