menu class improved

This commit is contained in:
2021-08-29 00:54:05 +02:00
parent 0baf73b9ae
commit 697e5d796f
3 changed files with 64 additions and 24 deletions

View File

@@ -64,7 +64,7 @@ void Menu::init(std::string name, int x, int y, int backgroundType)
mSelector.moving = false;
// Elementos del menu
for (int i = 0; i < MAX_ITEMS; i++)
for (int i = 0; i < MENU_MAX_ITEMS; i++)
{
mItem[i].label = "";
mItem[i].w = 0;
@@ -218,6 +218,7 @@ bool Menu::increaseSelectorIndex()
mSelector.target = mItem[mSelector.index].y;
mSelector.despY = (mSelector.target - mSelector.origin) / mSelector.numJumps;
mSelector.moving = true;
updateSelectorHeight();
return success;
}
@@ -238,6 +239,7 @@ bool Menu::decreaseSelectorIndex()
mSelector.target = mItem[mSelector.index].y;
mSelector.despY = (mSelector.target - mSelector.origin) / mSelector.numJumps;
mSelector.moving = true;
updateSelectorHeight();
return success;
}
@@ -284,11 +286,18 @@ void Menu::render()
{
mText->writeColored(mItem[i].x, mItem[i].y, mItem[i].label, mColorGreyed);
}
//else // no selectable
//{
// const color_t color = {mSelector.itemR, mSelector.itemG, mSelector.itemB};
// mText->writeColored(mItem[i].x, mItem[i].y, mItem[i].label, color);
//}
else // No seleccionable
{
if ((mItem[i].linkedUp) && (i == mSelector.index + 1))
{
const color_t color = {mSelector.itemR, mSelector.itemG, mSelector.itemB};
mText->writeColored(mItem[i].x, mItem[i].y, mItem[i].label, color);
}
else // No enlazado con el de arriba
{
mText->write(mItem[i].x, mItem[i].y, mItem[i].label);
}
}
}
}
@@ -310,13 +319,15 @@ void Menu::setRectSize()
mSelector.rect.h = (mText->getCharacterWidth() * 1) + 1;
mSelector.rect.w = mRectBG.rect.w;
mSelector.rect.x = mRectBG.rect.x;
updateSelectorHeight();
}
// Establece el valor de la variable
void Menu::setTotalItems(int num)
{
mTotalItems = num;
mTotalItems > MAX_ITEMS ? MAX_ITEMS : mTotalItems;
if (mTotalItems > MENU_MAX_ITEMS)
mTotalItems = MENU_MAX_ITEMS;
}
// Establece el color del rectangulo de fondo
@@ -361,7 +372,7 @@ void Menu::centerMenuOnX(int value)
mPosX = (value) - (mWidestItem / 2);
// Reposiciona los elementos del menu
for (int i = 0; i < MAX_ITEMS; i++)
for (int i = 0; i < MENU_MAX_ITEMS; i++)
{
mItem[i].x = mPosX;
}
@@ -410,7 +421,7 @@ void Menu::centerMenuElementsOnX()
}
// Añade un item al menu
void Menu::addItem(std::string text, const Uint8 hPaddingUp, const Uint8 hPaddingDown, bool selectable, bool greyed)
void Menu::addItem(std::string text, const Uint8 hPaddingUp, const Uint8 hPaddingDown, bool selectable, bool greyed, bool linkedDown)
{
// Si es el primer item coge la posición en el eje Y del propio menu
if (mTotalItems == 0)
@@ -427,6 +438,8 @@ void Menu::addItem(std::string text, const Uint8 hPaddingUp, const Uint8 hPaddin
mItem[mTotalItems].hPaddingDown = hPaddingDown;
mItem[mTotalItems].selectable = selectable;
mItem[mTotalItems].greyed = greyed;
mItem[mTotalItems].linkedDown = linkedDown;
mItem[mTotalItems + 1].linkedUp = linkedDown;
setTotalItems(mTotalItems + 1);
reorganize();
@@ -523,4 +536,23 @@ void Menu::setSelectable(Uint8 index, bool value)
void Menu::setGreyed(Uint8 index, bool value)
{
mItem[index].greyed = value;
}
// Establece el estado de enlace de un item
void Menu::setLinkedDown(Uint8 index, bool value)
{
mItem[index].linkedDown = value;
}
// Calcula la altura del selector
void Menu::updateSelectorHeight()
{
if (mItem[mSelector.index].linkedDown)
{
mSelector.rect.h = mItem[mSelector.index + 1].y + mItem[mSelector.index + 1].h - mItem[mSelector.index].y - 1;
}
else
{
mSelector.rect.h = mItem[mSelector.index].h - 1;
}
}