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

various clean-ups and improvements

Browse Source
This commit is contained in:
unknown
2008-08-18 17:16:00 +02:00
parent 3bfd8125ec
commit 34dfffaab0
8 changed files with 137 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/menu.cpp
View File

@@ -254,10 +254,7 @@ void Menu::Display(bool redraw_whole_window)
void Menu::Refresh(bool redraw_whole_window)
{
if (!itsOptions.empty() && is_static())
if (itsHighlight == 0)
Go(DOWN);
else
Go(UP);
itsHighlight == 0 ? Go(DOWN) : Go(UP);
int MaxBeginning = itsOptions.size() < itsHeight ? 0 : itsOptions.size()-itsHeight;
if (itsBeginning > MaxBeginning)
@@ -269,32 +266,6 @@ void Menu::Refresh(bool redraw_whole_window)
if (redraw_whole_window)
redraw_screen();
int line = 0;
/*int last;
if (itsOptions.size() < itsHeight)
last = itsOptions.size();
else
last = itsBeginning+itsHeight;
int check = 0;
bool next = 1;
for (int i = last-1; i > itsBeginning && next; i--)
{
next = 0;
try
{
itsOptions.at(i);
}
catch (std::out_of_range)
{
check++;
next = 1;
}
}
itsBeginning -= check;
last -= check;*/
for (vector<int>::const_iterator it = NeedsRedraw.begin(); it != NeedsRedraw.end(); it++)
{
try
@@ -306,7 +277,7 @@ void Menu::Refresh(bool redraw_whole_window)
break;
}
line = *it-itsBeginning;
int line = *it-itsBeginning;
if (*it == itsHighlight && itsHighlightEnabled)
{