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

Let Widget class don't support cascaded opacity and cascaded color on default.

This commit is contained in:
andyque 2014-08-06 16:21:00 +08:00
parent 9f51adfafa
commit ab33e6f9a2
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cocos/2d/CCProtectedNode.cpp
View File

@ -381,9 +381,9 @@ void ProtectedNode::updateDisplayedOpacity(GLubyte parentOpacity)
for(auto child : _children){ for(auto child : _children){
child->updateDisplayedOpacity(_displayedOpacity); child->updateDisplayedOpacity(_displayedOpacity);
} }
for(auto child : _protectedChildren){ }
child->updateDisplayedOpacity(_displayedOpacity); for(auto child : _protectedChildren){
} child->setOpacity(_realOpacity);
} }
} }
@ -399,9 +399,9 @@ void ProtectedNode::updateDisplayedColor(const Color3B& parentColor)
for(const auto &child : _children){ for(const auto &child : _children){
child->updateDisplayedColor(_displayedColor); child->updateDisplayedColor(_displayedColor);
} }
for(const auto &child : _protectedChildren){ }
child->updateDisplayedColor(_displayedColor); for(const auto &child : _protectedChildren){
} child->setColor(_realColor);
} }
} }
@ -411,7 +411,7 @@ void ProtectedNode::disableCascadeColor()
child->updateDisplayedColor(Color3B::WHITE); child->updateDisplayedColor(Color3B::WHITE);
} }
for(auto child : _protectedChildren){ for(auto child : _protectedChildren){
child->updateDisplayedColor(Color3B::WHITE); child->setColor(Color3B::WHITE);
} }
} }

3
cocos/ui/UIWidget.cpp
View File

@ -209,9 +209,6 @@ bool Widget::init()
ignoreContentAdaptWithSize(true); ignoreContentAdaptWithSize(true);
this->setCascadeColorEnabled(true);
this->setCascadeOpacityEnabled(true);
return true; return true;
} }
return false; return false;