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

reinstate font scale backup in SimpleButton, to fix the bug I introduced recently.

Browse Source
This commit is contained in:
wagic.the.homebrew
2012-03-24 02:47:14 +00:00
parent 41e608785f
commit 7a18996bee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/SimpleButton.cpp
+7 -2
View File
@@ -199,8 +199,11 @@ void SimpleButton::setText( const string& text)
float SimpleButton::GetWidth() float SimpleButton::GetWidth()
{ {
WFont * mFont = WResourceManager::Instance()->GetWFont(mFontId); WFont * mFont = WResourceManager::Instance()->GetWFont(mFontId);
float backup = mFont->GetScale();
mFont->SetScale(1.0); 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() float SimpleButton::GetEnlargedWidth()
@@ -210,7 +213,9 @@ float SimpleButton::GetEnlargedWidth()
mFont->SetScale(SCALE_SELECTED); mFont->SetScale(SCALE_SELECTED);
if(mText.size() < 20) if(mText.size() < 20)
mFont->SetScale(SCALE_SELECTED_LARGE); 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 ostream& SimpleButton::toString(ostream& out) const