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

Bug fix & make test case more clear. 

1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
This commit is contained in:
XiaoFeng 2015-12-07 18:03:22 +08:00
parent 9ff4fb4f7e
commit 73d0f8a46e
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCCameraBackgroundBrush.cpp
View File

@ -232,8 +232,8 @@ CameraBackgroundSkyBoxBrush::CameraBackgroundSkyBoxBrush()
, _vertexBuffer(0) , _vertexBuffer(0)
, _indexBuffer(0) , _indexBuffer(0)
, _texture(nullptr) , _texture(nullptr)
, _actived(false) , _actived(true)
, _textureValid(false) , _textureValid(true)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
_backToForegroundListener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, _backToForegroundListener = EventListenerCustom::create(EVENT_RENDERER_RECREATED,

6
cocos/ui/UIButton.cpp
View File

@ -235,7 +235,7 @@ void Button::loadTextureNormal(const std::string& normal,TextureResType texType)
bool textureLoaded = true; bool textureLoaded = true;
if (normal.empty()) if (normal.empty())
{ {
_buttonNormalRenderer->init(); _buttonNormalRenderer->resetRender();
textureLoaded = false; textureLoaded = false;
} }
else else
@ -292,7 +292,7 @@ void Button::loadTexturePressed(const std::string& selected,TextureResType texTy
bool textureLoade = true; bool textureLoade = true;
if (selected.empty()) if (selected.empty())
{ {
_buttonClickedRenderer->init(); _buttonClickedRenderer->resetRender();
textureLoade = false; textureLoade = false;
} }
else else
@ -335,7 +335,7 @@ void Button::loadTextureDisabled(const std::string& disabled,TextureResType texT
bool textureLoaded = true; bool textureLoaded = true;
if (disabled.empty()) if (disabled.empty())
{ {
_buttonDisabledRenderer->init(); _buttonDisabledRenderer->resetRender();
textureLoaded = false; textureLoaded = false;
} }
else else

4
cocos/ui/UISlider.cpp
View File

@ -157,7 +157,7 @@ void Slider::loadBarTexture(const std::string& fileName, TextureResType texType)
_barTexType = texType; _barTexType = texType;
if (fileName.empty()) if (fileName.empty())
{ {
_barRenderer->init(); _barRenderer->resetRender();
} }
else else
{ {
@ -196,7 +196,7 @@ void Slider::loadProgressBarTexture(const std::string& fileName, TextureResType
_progressBarTexType = texType; _progressBarTexType = texType;
if (fileName.empty()) if (fileName.empty())
{ {
_progressBarRenderer->init(); _progressBarRenderer->resetRender();
} }
else else
{ {

1
tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
View File

@ -2084,6 +2084,7 @@ void LabelLayoutBaseTest::initWrapOption(const cocos2d::Size& size)
checkBox->setScale(0.5); checkBox->setScale(0.5);
checkBox->setSelected(true); checkBox->setSelected(true);
checkBox->setName("toggleWrap"); checkBox->setName("toggleWrap");
checkBox->setEnabled(false);
checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){ checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){
if (event == CheckBox::EventType::SELECTED) { if (event == CheckBox::EventType::SELECTED) {