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

Add conditions to evaluate for setter of font size and font name.

This commit is contained in:
Dhilan007 2014-03-12 10:53:51 +08:00
parent d96cc9ecb9
commit aefafdbe77
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocos/2d/CCLabel.cpp
View File

@ -982,20 +982,30 @@ void Label::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parent
void Label::setFontName(const std::string& fontName)
{
_fontDefinition._fontName = fontName;
if (fontName.find('.') != fontName.npos)
{
auto config = _fontConfig;
config.fontFilePath = fontName;
setTTFConfig(config);
if (setTTFConfig(config))
{
return;
}
}
if (_fontDefinition._fontName != fontName)
{
_fontDefinition._fontName = fontName;
_contentDirty = true;
}
}
void Label::setFontSize(int fontSize)
{
if (_currentLabelType == LabelType::TTF)
{
if (_fontConfig.fontSize == fontSize)
{
return;
}
if (_fontConfig.distanceFieldEnabled)
{
_fontConfig.fontSize = fontSize;
@ -1008,7 +1018,7 @@ void Label::setFontSize(int fontSize)
setTTFConfig(fontConfig);
}
}
else
else if(_fontDefinition._fontSize != fontSize)
{
_fontDefinition._fontSize = fontSize;
_fontConfig.fontSize = fontSize;