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

Additional scaling issues fixes + bug fix by Zeth in SimpleMenu

Browse Source
This commit is contained in:
wagic.the.homebrew
2012-03-21 14:58:53 +00:00
parent a581d1bba3
commit bdec6c6b7d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/SimpleMenu.cpp
+6 -1
View File
@@ -137,8 +137,12 @@ void SimpleMenu::Render()
float width = (static_cast<SimpleMenuItem*> (mObjects[i]))->GetEnlargedWidth() + 15; float width = (static_cast<SimpleMenuItem*> (mObjects[i]))->GetEnlargedWidth() + 15;
if (mWidth < width) mWidth = width; if (mWidth < width) mWidth = width;
} }
float scaleFactor = titleFont->GetScale();
titleFont->SetScale(SCALE_NORMAL);
if ((!title.empty()) && (mWidth < titleFont->GetStringWidth(title.c_str()))) if ((!title.empty()) && (mWidth < titleFont->GetStringWidth(title.c_str())))
mWidth = titleFont->GetStringWidth(title.c_str()); mWidth = titleFont->GetStringWidth(title.c_str());
titleFont->SetScale(scaleFactor);
mWidth += 2 * kHorizontalMargin; mWidth += 2 * kHorizontalMargin;
if (mCenterHorizontal) if (mCenterHorizontal)
@@ -249,7 +253,8 @@ bool SimpleMenu::CheckUserInput(JButton key)
} }
else if (y > mHeight) // this will scroll downwards in a list. else if (y > mHeight) // this will scroll downwards in a list.
{ {
n = mCurr + 1; if (mCurr < mCount-1)
n = mCurr + 1;
} }
} }
} }