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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix

This commit is contained in:
samuele3hu 2014-04-10 15:55:45 +08:00
parent 249163c32d 428cea061c
commit 748391f252
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/2d/CCEventDispatcher.cpp
View File

@ -1371,6 +1371,13 @@ void EventDispatcher::setDirtyForNode(Node* node)
{
_dirtyNodes.insert(node);
}
// Also set the dirty flag for node's children
const auto& children = node->getChildren();
for (const auto& child : children)
{
setDirtyForNode(child);
}
}
void EventDispatcher::setDirty(const EventListener::ListenerID& listenerID, DirtyFlag flag)

8
tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
View File

@ -131,9 +131,11 @@ void TouchableSpriteTest::onEnter()
Point origin = Director::getInstance()->getVisibleOrigin();
Size size = Director::getInstance()->getVisibleSize();
auto containerForSprite1 = Node::create();
auto sprite1 = Sprite::create("Images/CyanSquare.png");
sprite1->setPosition(origin+Point(size.width/2, size.height/2) + Point(-80, 80));
addChild(sprite1, 10);
containerForSprite1->addChild(sprite1);
addChild(containerForSprite1, 10);
auto sprite2 = Sprite::create("Images/MagentaSquare.png");
sprite2->setPosition(origin+Point(size.width/2, size.height/2));
@ -174,11 +176,11 @@ void TouchableSpriteTest::onEnter()
target->setOpacity(255);
if (target == sprite2)
{
sprite1->setLocalZOrder(100);
containerForSprite1->setLocalZOrder(100);
}
else if(target == sprite1)
{
sprite1->setLocalZOrder(0);
containerForSprite1->setLocalZOrder(0);
}
};