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

recalculated height of menu items previous calculation did not take into scaling of the text

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-03-24 06:48:02 +00:00
parent 14bdc0fd08
commit c8007e7179
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,9 +241,11 @@ bool SimpleMenu::CheckUserInput(JButton key)
{ {
float top, left; float top, left;
SimpleMenuItem * currentItem = static_cast<SimpleMenuItem *>(mObjects[mCurr]); SimpleMenuItem * currentItem = static_cast<SimpleMenuItem *>(mObjects[mCurr]);
float fontHeight = WResourceManager::Instance()->GetWFont(currentItem->getFontId())->GetHeight(); WFont * currentFont = WResourceManager::Instance()->GetWFont(currentItem->getFontId());
float scaledFontHeight = currentFont->GetHeight() * currentFont->GetScale();
float fontHeight = scaledFontHeight > kLineHeight ? scaledFontHeight : kLineHeight;
float menuTopEdge = fontHeight + mY + spadeR->mHeight; float menuTopEdge = fontHeight + mY + spadeR->mHeight;
float menuBottomEdge = menuTopEdge + (maxItems * fontHeight); float menuBottomEdge = menuTopEdge + ( (maxItems -1) * fontHeight);
for (int i = 0; i < mCount; i++) for (int i = 0; i < mCount; i++)
{ {