Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a bug in Display::SongInColumns() that sometimes corrupted last column

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-02-19 12:44:40 +01:00
parent 68fa910c78
commit 4bd9e9af79
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/display.cpp
View File

@@ -39,10 +39,10 @@ std::string Display::Columns()
for (std::vector<Column>::const_iterator it = Config.columns.begin(); it != Config.columns.end(); ++it) for (std::vector<Column>::const_iterator it = Config.columns.begin(); it != Config.columns.end(); ++it)
{ {
if (last_fixed && it == next2last) if (it == Config.columns.end()-1)
width = COLS-where-(++next2last)->width;
else if (it == Config.columns.end()-1)
width = COLS-where; width = COLS-where;
else if (last_fixed && it == next2last)
width = COLS-where-(++next2last)->width;
else else
width = it->width*(it->fixed ? 1 : COLS/100.0); width = it->width*(it->fixed ? 1 : COLS/100.0);
@@ -146,10 +146,10 @@ void Display::SongsInColumns(const MPD::Song &s, void *, Menu<MPD::Song> *menu)
*menu << clEnd; *menu << clEnd;
} }
if (last_fixed && it == next2last) if (it == Config.columns.end()-1)
width = COLS-where-(++next2last)->width;
else if (it == Config.columns.end()-1)
width = menu->GetWidth()-where; width = menu->GetWidth()-where;
else if (last_fixed && it == next2last)
width = COLS-where-(++next2last)->width;
else else
width = it->width*(it->fixed ? 1 : COLS/100.0); width = it->width*(it->fixed ? 1 : COLS/100.0);