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

fix layout backimage size error with neweset scale9sprite

This commit is contained in:
Liam 2015-12-25 14:11:56 +08:00
parent 3a09bd400d
commit c92b563c28
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cocos/ui/UILayout.cpp
View File

@ -531,10 +531,12 @@ void Layout::onSizeChanged()
if (_backGroundImage) if (_backGroundImage)
{ {
_backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f); _backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f);
if (_backGroundScale9Enabled && _backGroundImage) if (_backGroundScale9Enabled){
{
_backGroundImage->setPreferredSize(_contentSize); _backGroundImage->setPreferredSize(_contentSize);
} }
else{
_backGroundImage->setPreferredSize(_backGroundImageTextureSize);
}
} }
if (_colorRender) if (_colorRender)
{ {
@ -560,12 +562,10 @@ void Layout::setBackGroundImageScale9Enabled(bool able)
} }
if(_backGroundScale9Enabled){ if(_backGroundScale9Enabled){
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SLICE); _backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SLICE);
_backGroundImage->setPreferredSize(_contentSize);
}else{ }else{
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SIMPLE); _backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
} _backGroundImage->setPreferredSize(_backGroundImageTextureSize);
if (able) {
_backGroundImage->setPreferredSize(_contentSize);
} }
setBackGroundImageCapInsets(_backGroundImageCapInsets); setBackGroundImageCapInsets(_backGroundImageCapInsets);
@ -605,12 +605,15 @@ void Layout::setBackGroundImage(const std::string& fileName,TextureResType texTy
default: default:
break; break;
} }
if (_backGroundScale9Enabled) {
_backGroundImage->setPreferredSize(_contentSize);
}
_backGroundImageTextureSize = _backGroundImage->getContentSize(); _backGroundImageTextureSize = _backGroundImage->getContentSize();
_backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f); _backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f);
if (_backGroundScale9Enabled) {
_backGroundImage->setPreferredSize(_contentSize);
}
else{
_backGroundImage->setPreferredSize(_backGroundImageTextureSize);
}
updateBackGroundImageRGBA(); updateBackGroundImageRGBA();
} }