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

fixed logical error in Label::updateFont.

This commit is contained in:
Dhilan007 2014-03-31 15:29:24 +08:00
parent cffdb129c9
commit 774debd142
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCLabel.cpp
View File

@ -37,6 +37,7 @@
#include "CCEventDispatcher.h" #include "CCEventDispatcher.h"
#include "CCEventType.h" #include "CCEventType.h"
#include "CCEventCustom.h" #include "CCEventCustom.h"
#include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -344,6 +345,7 @@ void Label::reset()
_shadowEnabled = false; _shadowEnabled = false;
_clipEnabled = false; _clipEnabled = false;
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
} }
void Label::updateShaderProgram() void Label::updateShaderProgram()
@ -1051,7 +1053,7 @@ void Label::updateContent()
void Label::updateFont() void Label::updateFont()
{ {
if (_fontName.find('.') != _fontName.npos) if (FileUtils::getInstance()->isFileExist(_fontName))
{ {
_fontConfig.fontFilePath = _fontName; _fontConfig.fontFilePath = _fontName;
_fontConfig.fontSize = _fontSize; _fontConfig.fontSize = _fontSize;