Added some important access to some data in fonts, changed how the font texture coordinates are saved ( so you'll need to regenerate them ).

Fixed some minor bugs.
This commit is contained in:
spartanj@gmail.com
2012-02-23 15:23:07 -03:00
parent d4a866feca
commit 99b3c679a1
22 changed files with 278 additions and 121 deletions

View File

@@ -300,15 +300,15 @@ void cUIListBox::SetRowHeight() {
Uint32 FontSize = 12;
if ( NULL != cUIThemeManager::instance()->DefaultFont() )
FontSize = cUIThemeManager::instance()->DefaultFont()->GetFontSize();
FontSize = cUIThemeManager::instance()->DefaultFont()->GetFontHeight();
if ( NULL != mSkinState && NULL != mSkinState->GetSkin() && NULL != mSkinState->GetSkin()->Theme() && NULL != mSkinState->GetSkin()->Theme()->Font() )
FontSize = mSkinState->GetSkin()->Theme()->Font()->GetFontSize();
FontSize = mSkinState->GetSkin()->Theme()->Font()->GetFontHeight();
if ( NULL != mFont )
FontSize = mFont->GetFontSize();
FontSize = mFont->GetFontHeight();
mRowHeight = (Uint32)( FontSize * 1.5f );
mRowHeight = (Uint32)( FontSize + 4 );
}
if ( tOldRowHeight != mRowHeight ) {