From 7a18996bee0c1ddefa06835b95ae0ff61a123aa5 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew" Date: Sat, 24 Mar 2012 02:47:14 +0000 Subject: [PATCH] reinstate font scale backup in SimpleButton, to fix the bug I introduced recently. --- projects/mtg/src/SimpleButton.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/SimpleButton.cpp b/projects/mtg/src/SimpleButton.cpp index cc0294cc1..19a1c7383 100644 --- a/projects/mtg/src/SimpleButton.cpp +++ b/projects/mtg/src/SimpleButton.cpp @@ -199,8 +199,11 @@ void SimpleButton::setText( const string& text) float SimpleButton::GetWidth() { WFont * mFont = WResourceManager::Instance()->GetWFont(mFontId); + float backup = mFont->GetScale(); mFont->SetScale(1.0); - return mFont->GetStringWidth(mText.c_str()); + float result = mFont->GetStringWidth(mText.c_str()); + mFont->SetScale(backup); + return result; } float SimpleButton::GetEnlargedWidth() @@ -210,7 +213,9 @@ float SimpleButton::GetEnlargedWidth() mFont->SetScale(SCALE_SELECTED); if(mText.size() < 20) mFont->SetScale(SCALE_SELECTED_LARGE); - return mFont->GetStringWidth(mText.c_str()); + float result = mFont->GetStringWidth(mText.c_str()); + mFont->SetScale(backup); + return result; } ostream& SimpleButton::toString(ostream& out) const