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

Merge pull request #7064 from kyokomi/TextReader_filePath_fix 

Fix bug for TextReader #setFontName.
This commit is contained in:
minggo 2014-06-18 10:36:29 +08:00
parent ba54f8c92c b6ed783b0b
commit 8a0a6a2ded
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/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
View File

@ -51,7 +51,9 @@ namespace cocostudio
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
if (fn)
{
label->setFontName(DICTOOL->getStringValue_json(options, "fontName"));
std::string fontName = DICTOOL->getStringValue_json(options, "fontName");
std::string fontFilePath = jsonPath.append(fontName);
label->setFontName(fontFilePath);
}
bool aw = DICTOOL->checkObjectExist_json(options, "areaWidth");
bool ah = DICTOOL->checkObjectExist_json(options, "areaHeight");