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

Modify reader

This commit is contained in:
CaiWenzhi 2013-12-26 21:02:47 +08:00
parent a8ab58d8d8
commit 26a7f3474c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cocos/editor-support/cocostudio/CCSGUIReader.cpp
View File

@ -1025,17 +1025,22 @@ Widget* WidgetPropertiesReader0300::widgetFromJsonDictionary(JsonDictionary *dat
Widget* child = widgetFromJsonDictionary(subData);
if (child)
{
if (dynamic_cast<PageView*>(widget))
PageView* pageView = dynamic_cast<PageView*>(widget);
if (pageView)
{
dynamic_cast<PageView*>(widget)->addPage(static_cast<Layout*>(child));
}
else if (dynamic_cast<ListView*>(widget))
{
dynamic_cast<ListView*>(widget)->pushBackCustomItem(child);
pageView->addPage(static_cast<Layout*>(child));
}
else
{
widget->addChild(child);
ListView* listView = dynamic_cast<ListView*>(widget);
if (listView)
{
listView->pushBackCustomItem(child);
}
else
{
widget->addChild(child);
}
}
}
CC_SAFE_DELETE(subData);
@ -1949,7 +1954,7 @@ void WidgetPropertiesReader0300::setPropsForListViewFromJsonDictionary(Widget* w
{
setPropsForLayoutFromJsonDictionary(widget, options);
ListView* listView = (ListView*)widget;
ListView* listView = static_cast<ListView*>(widget);
float innerWidth = DICTOOL->getFloatValue_json(options, "innerWidth");
float innerHeight = DICTOOL->getFloatValue_json(options, "innerHeight");