clean up and fixes
This commit is contained in:
@@ -227,11 +227,21 @@ bool Menu::increaseSelectorIndex()
|
||||
mSelector.h = mSelector.originH = getSelectorHeight(mSelector.index);
|
||||
|
||||
// Calcula cual es el siguiente elemento
|
||||
if (mSelector.index < (mTotalItems - 1))
|
||||
//if (mSelector.index < (mTotalItems - 1))
|
||||
//{
|
||||
// mSelector.index++;
|
||||
// while ((!mItem[mSelector.index].selectable) && (mSelector.index < (mTotalItems - 1)))
|
||||
// mSelector.index++;
|
||||
// success = true;
|
||||
//}
|
||||
|
||||
// Calcula cual es el siguiente elemento (versión con loop)
|
||||
//if (mSelector.index < (mTotalItems - 1))
|
||||
{
|
||||
mSelector.index++;
|
||||
while ((!mItem[mSelector.index].selectable) && (mSelector.index < (mTotalItems - 1)))
|
||||
mSelector.index++;
|
||||
++mSelector.index %= mTotalItems;
|
||||
while (!mItem[mSelector.index].selectable)
|
||||
//mSelector.index++;
|
||||
++mSelector.index %= mTotalItems;
|
||||
success = true;
|
||||
}
|
||||
|
||||
@@ -261,11 +271,28 @@ bool Menu::decreaseSelectorIndex()
|
||||
mSelector.h = mSelector.originH = getSelectorHeight(mSelector.index);
|
||||
|
||||
// Calcula cual es el siguiente elemento
|
||||
if (mSelector.index > 0)
|
||||
//if (mSelector.index > 0)
|
||||
//{
|
||||
// mSelector.index--;
|
||||
// while ((!mItem[mSelector.index].selectable) && (mSelector.index > 0))
|
||||
// mSelector.index--;
|
||||
// success = true;
|
||||
//}
|
||||
|
||||
// Calcula cual es el siguiente elemento (versión con loop)
|
||||
//if (mSelector.index > 0)
|
||||
{
|
||||
mSelector.index--;
|
||||
while ((!mItem[mSelector.index].selectable) && (mSelector.index > 0))
|
||||
if (mSelector.index == 0)
|
||||
mSelector.index = mTotalItems;
|
||||
else
|
||||
mSelector.index--;
|
||||
while (!mItem[mSelector.index].selectable)
|
||||
{
|
||||
if (mSelector.index == 0)
|
||||
mSelector.index = mTotalItems;
|
||||
else
|
||||
mSelector.index--;
|
||||
}
|
||||
success = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user