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

Merge pull request #8977 from pipu/v3_Modify_TextReader 

Modify that parsing attribute "fontName" of TextReader
This commit is contained in:
minggo 2014-11-11 12:05:49 +08:00
parent 7417d59447 2ed51e042d
commit 6c67c6921d
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
View File

@ -163,15 +163,7 @@ namespace cocostudio
label->setFontSize(fontSize); label->setFontSize(fontSize);
std::string fontName = options.has_fontname() ? options.fontname() : "微软雅黑"; std::string fontName = options.has_fontname() ? options.fontname() : "微软雅黑";
label->setFontName(fontName);
std::string fontFilePath = protocolBuffersPath.append(fontName);
if (FileUtils::getInstance()->isFileExist(fontFilePath))
{
label->setFontName(fontFilePath);
}
else{
label->setFontName(fontName);
}
bool aw = options.has_areawidth(); bool aw = options.has_areawidth();
bool ah = options.has_areaheight(); bool ah = options.has_areaheight();