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

Move "ui::Helper::DoLayout" to "CreateNode".

This commit is contained in:
zhangcheng 2015-09-14 13:07:15 +08:00
parent c532db4f11
commit f88b23f52b
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -265,17 +265,24 @@ Node* CSLoader::createNode(const std::string& filename)
CCLOG("suffix = %s", suffix.c_str());
CSLoader* load = CSLoader::getInstance();
Node *node = nullptr;
if (suffix == "csb")
{
return load->createNodeWithFlatBuffersFile(filename);
node = load->createNodeWithFlatBuffersFile(filename);
}
else if (suffix == "json" || suffix == "ExportJson")
{
return load->createNodeFromJson(filename);
node = load->createNodeFromJson(filename);
}
return nullptr;
if (node != nullptr)
{
Size frameSize = Director::getInstance()->getVisibleSize();
node->setContentSize(frameSize);
ui::Helper::doLayout(node);
}
return node;
}
Node* CSLoader::createNode(const std::string &filename, const ccNodeLoadCallback &callback)
@ -286,13 +293,20 @@ Node* CSLoader::createNode(const std::string &filename, const ccNodeLoadCallback
CCLOG("suffix = %s", suffix.c_str());
CSLoader* load = CSLoader::getInstance();
Node *node = nullptr;
if (suffix == "csb")
{
return load->createNodeWithFlatBuffersFile(filename, callback);
node = load->createNodeWithFlatBuffersFile(filename, callback);
}
return nullptr;
if (node != nullptr)
{
Size frameSize = Director::getInstance()->getVisibleSize();
node->setContentSize(frameSize);
ui::Helper::doLayout(node);
}
return node;
}
std::string CSLoader::getExtentionName(const std::string& name)
@ -551,7 +565,7 @@ void CSLoader::initNode(Node* node, const rapidjson::Value& json)
GLubyte red = (GLubyte)DICTOOL->getIntValue_json(json, RED, 255);
GLubyte green = (GLubyte)DICTOOL->getIntValue_json(json, GREEN, 255);
GLubyte blue = (GLubyte)DICTOOL->getIntValue_json(json, BLUE, 255);
int zorder = DICTOOL->getIntValue_json(json, ZORDER);
int zorder = DICTOOL->getIntValue_json(json, ZORDER);
int tag = DICTOOL->getIntValue_json(json, TAG);
int actionTag = DICTOOL->getIntValue_json(json, ACTION_TAG);
bool visible = DICTOOL->getBooleanValue_json(json, VISIBLE);