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

Merge pull request #7275 from andyque/fixBinaryLoaderSize 

fix content Size
This commit is contained in:
minggo 2014-07-01 22:03:14 +08:00
parent bf60cc5f83 7d2685ba02
commit a5452a29aa
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/WidgetReader.cpp
View File

@ -264,7 +264,9 @@ namespace cocostudio
widget->setColor(_color);
widget->setOpacity(_opacity);
//the setSize method will be conflict with scale9Width & scale9Height
widget->setSize(Size(_width, _height));
if (!widget->isIgnoreContentAdaptWithSize()) {
widget->setSize(Size(_width, _height));
}
widget->setPosition(_position);
widget->setAnchorPoint(_originalAnchorPoint);
}