Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved scrolling of simple menus. Now you can scroll up as well as down by activating the area above/below the menu items

Browse Source 
removed the buttons when displaying the filter menus.
This commit is contained in:
techdragon.nguyen@gmail.com
2012-03-23 13:17:13 +00:00
parent 5ab2b607f2
commit 218db9d844
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/src/JGui.cpp
View File

@@ -181,6 +181,8 @@ bool JGuiController::CheckUserInput(JButton key)
minDistance2 = distance2;
n = i;
}
else
break;
}
}

4
projects/mtg/src/GameStateShop.cpp
View File

@@ -723,6 +723,7 @@ void GameStateShop::Render()
if (shopMenu)
shopMenu->Render();
if (filterMenu && !filterMenu->isFinished())
filterMenu->Render();
else
@@ -790,7 +791,8 @@ void GameStateShop::Render()
if (menu)
menu->Render();
renderButtons();
if (filterMenu && filterMenu->isFinished())
renderButtons();
}
void GameStateShop::ButtonPressed(int controllerId, int controlId)

26
projects/mtg/src/SimpleMenu.cpp
View File

@@ -240,25 +240,35 @@ bool SimpleMenu::CheckUserInput(JButton key)
if (mObjects.size())
{
float top, left;
SimpleMenuItem * currentItem = static_cast<SimpleMenuItem *>(mObjects[mCurr]);
float fontHeight = WResourceManager::Instance()->GetWFont(currentItem->getFontId())->GetHeight();
float menuTopEdge = fontHeight + mY + spadeR->mHeight;
float menuBottomEdge = menuTopEdge + (maxItems * fontHeight);
for (int i = 0; i < mCount; i++)
{
if (mObjects[i]->getTopLeft(top, left))
{
distance2 = (unsigned int)((top - y) * (top - y) + (left - x) * (left - x));
if ( (distance2 < minDistance2) )
if ( (distance2 <= minDistance2) )
{
minDistance2 = distance2;
n = i;
}
else if (y > mHeight) // this will scroll downwards in a list.
{
if (mCurr < mCount-1)
n = mCurr + 1;
if (y < menuTopEdge)
{
n = (mCurr - 1) > 0 ? mCurr - 1 : 0;
break;
}
else if (y > menuBottomEdge)
{
n = (mCurr + 1) < mCount ? mCurr + 1 : mCount - 1;
break;
}
else
n = i;
}
}
}
// check to see if the user clicked
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN))
{
mCurr = n;