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

fix Text reader font name

This commit is contained in:
andyque 2014-07-02 10:08:04 +08:00
parent 60a791ac12
commit fb3e499d9d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,9 @@ namespace cocostudio
stExpCocoNode *stChildArray = cocoNode->GetChildArray(); stExpCocoNode *stChildArray = cocoNode->GetChildArray();
Text* label = static_cast<Text*>(widget); Text* label = static_cast<Text*>(widget);
std::string jsonPath = GUIReader::getInstance()->getFilePath();
for (int i = 0; i < cocoNode->GetChildNum(); ++i) { for (int i = 0; i < cocoNode->GetChildNum(); ++i) {
std::string key = stChildArray[i].GetName(cocoLoader); std::string key = stChildArray[i].GetName(cocoLoader);
@ -67,7 +69,8 @@ namespace cocostudio
}else if(key == P_FontSize){ }else if(key == P_FontSize){
label->setFontSize(valueToInt(value)); label->setFontSize(valueToInt(value));
}else if(key == P_FontName){ }else if(key == P_FontName){
label->setFontName(value); std::string fontFilePath = jsonPath.append(value);
label->setFontName(fontFilePath);
}else if(key == P_AreaWidth){ }else if(key == P_AreaWidth){
label->setTextAreaSize(Size(valueToFloat(value), label->getTextAreaSize().height)); label->setTextAreaSize(Size(valueToFloat(value), label->getTextAreaSize().height));
}else if(key == P_AreaHeight){ }else if(key == P_AreaHeight){