Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compile error, and fix check of the fontname

This commit is contained in:
felixjingga 2015-05-20 16:34:45 +07:00
parent dcf4492ff0
commit ee13dd82b8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/ui/UIButton.cpp
View File

@ -793,7 +793,9 @@ void Button::setTitleFontSize(float size)
TTFConfig config = _titleRenderer->getTTFConfig();
config.fontSize = size;
_titleRenderer->setTTFConfig(config);
} else {
}
else
{
// BMFont can't set its font size
size = _fontSize;
}
@ -824,10 +826,12 @@ void Button::setTitleFontName(const std::string& fontName)
}
if(FileUtils::getInstance()->isFileExist(fontName))
{
if (fontName.find(".fnt") != std::string::npos || fontName.find(".FNT") != std::string::npos)
std::string lowerCasedFontName = fontName;
std::transform(lowerCasedFontName.begin(), lowerCasedFontName.end(), lowerCasedFontName.begin(), ::tolower);
if (lowerCasedFontName.find(".fnt") != std::string::npos)
{
_titleRenderer->setBMFontFilePath(fontName);
_type = FontType::BMFont;
_type = FontType::BMFONT;
}
else
{