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

make guard checks in Menu::Refresh() more readable

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-06 05:28:47 +02:00
parent 349ca52b8e
commit c0fcac9b1d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/menu.h
View File

@@ -380,26 +380,25 @@ template <typename T> void NCurses::Menu<T>::Refresh()
return; return;
} }
int MaxBeginning = itsOptionsPtr->size() < itsHeight ? 0 : itsOptionsPtr->size()-itsHeight; int MaxBeginning = itsOptionsPtr->size() < itsHeight ? 0 : itsOptionsPtr->size()-itsHeight;
if (itsHighlight > itsBeginning+int(itsHeight)-1)
if (itsBeginning < itsHighlight-int(itsHeight)+1) // highlighted position is off the screen
itsBeginning = itsHighlight-itsHeight+1; itsBeginning = itsHighlight-itsHeight+1;
if (itsBeginning < 0) if (itsBeginning < 0)
itsBeginning = 0; itsBeginning = 0;
else if (itsBeginning > MaxBeginning) else if (itsBeginning > MaxBeginning)
itsBeginning = MaxBeginning; itsBeginning = MaxBeginning;
if (!itsOptionsPtr->empty() && itsHighlight > int(itsOptionsPtr->size())-1) if (!itsOptionsPtr->empty() && itsHighlight > int(itsOptionsPtr->size())-1)
itsHighlight = itsOptionsPtr->size()-1; itsHighlight = itsOptionsPtr->size()-1;
if (!(*itsOptionsPtr)[itsHighlight]) // it shouldn't be on separator.
if (!(*itsOptionsPtr)[itsHighlight] || (*itsOptionsPtr)[itsHighlight]->isStatic) // it shouldn't be here
{ {
Scroll(wUp); Scroll(wUp);
if (!(*itsOptionsPtr)[itsHighlight]) // if it's still on separator, move in other direction. if (!(*itsOptionsPtr)[itsHighlight] || (*itsOptionsPtr)[itsHighlight]->isStatic)
Scroll(wDown);
}
else if ((*itsOptionsPtr)[itsHighlight]->isStatic) // static option can't be chosen
{
Scroll(wUp);
if ((*itsOptionsPtr)[itsHighlight]->isStatic) // if it's still chosen, scroll in other direction
Scroll(wDown); Scroll(wDown);
} }
size_t line = 0; size_t line = 0;
for (size_t i = itsBeginning; i < itsBeginning+itsHeight; ++i) for (size_t i = itsBeginning; i < itsBeginning+itsHeight; ++i)
{ {