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

Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip 

fixed the clipping of ui layout read from CocoStudio could not work
This commit is contained in:
James Chen 2014-04-28 11:08:40 +08:00
parent ede1a8bed1 c492f4d3c3
commit aa04176d83
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp
View File

@ -54,6 +54,8 @@ namespace cocostudio
panel->setSize(Size(w, h)); panel->setSize(Size(w, h));
/**/ /**/
panel->setClippingEnabled(DICTOOL->getBooleanValue_json(options, "clipAble"));
bool backGroundScale9Enable = DICTOOL->getBooleanValue_json(options, "backGroundScale9Enable"); bool backGroundScale9Enable = DICTOOL->getBooleanValue_json(options, "backGroundScale9Enable");
panel->setBackGroundImageScale9Enabled(backGroundScale9Enable); panel->setBackGroundImageScale9Enabled(backGroundScale9Enable);
int cr = DICTOOL->getIntValue_json(options, "bgColorR"); int cr = DICTOOL->getIntValue_json(options, "bgColorR");