From c8007e71798da9151ecd6924adfc8780d797395e Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Sat, 24 Mar 2012 06:48:02 +0000 Subject: [PATCH] recalculated height of menu items previous calculation did not take into scaling of the text --- projects/mtg/src/SimpleMenu.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index 6e923b0a2..5555a8b4d 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -241,9 +241,11 @@ bool SimpleMenu::CheckUserInput(JButton key) { float top, left; SimpleMenuItem * currentItem = static_cast(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 menuBottomEdge = menuTopEdge + (maxItems * fontHeight); + float menuBottomEdge = menuTopEdge + ( (maxItems -1) * fontHeight); for (int i = 0; i < mCount; i++) {