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

Merge pull request #3697 from dumganhar/iss2087-new-event-dispatcher 

Fixing MenuTest crash.
This commit is contained in:
James Chen 2013-09-18 08:42:09 -07:00
parent 339b4fa749 c7612fee15
commit ec7cfae4e8
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.cpp
View File

@ -581,7 +581,7 @@ RemoveMenuItemWhenMove::RemoveMenuItemWhenMove()
_touchListener->onTouchBegan = CC_CALLBACK_2(RemoveMenuItemWhenMove::onTouchBegan, this); _touchListener->onTouchBegan = CC_CALLBACK_2(RemoveMenuItemWhenMove::onTouchBegan, this);
_touchListener->onTouchMoved = CC_CALLBACK_2(RemoveMenuItemWhenMove::onTouchMoved, this); _touchListener->onTouchMoved = CC_CALLBACK_2(RemoveMenuItemWhenMove::onTouchMoved, this);
EventDispatcher::getInstance()->addEventListenerWithFixedPriority(_touchListener, -100); EventDispatcher::getInstance()->addEventListenerWithFixedPriority(_touchListener, -129);
} }
@ -592,14 +592,10 @@ void RemoveMenuItemWhenMove::goBack(Object *pSender)
RemoveMenuItemWhenMove::~RemoveMenuItemWhenMove() RemoveMenuItemWhenMove::~RemoveMenuItemWhenMove()
{ {
EventDispatcher::getInstance()->removeEventListener(_touchListener);
CC_SAFE_RELEASE(item); CC_SAFE_RELEASE(item);
} }
//void RemoveMenuItemWhenMove::registerWithTouchDispatcher(void)
//{
// Director::getInstance()->getTouchDispatcher()->addTargetedDelegate(this, -129, false);
//}
bool RemoveMenuItemWhenMove::onTouchBegan(Touch *touch, Event *event) bool RemoveMenuItemWhenMove::onTouchBegan(Touch *touch, Event *event)
{ {
return true; return true;
@ -617,6 +613,8 @@ void RemoveMenuItemWhenMove::onTouchMoved(Touch *touch, Event *event)
void MenuTestScene::runThisTest() void MenuTestScene::runThisTest()
{ {
MenuItemFont::setFontSize(20);
auto layer1 = new MenuLayerMainMenu(); auto layer1 = new MenuLayerMainMenu();
auto layer2 = new MenuLayer2(); auto layer2 = new MenuLayer2();
auto layer3 = new MenuLayer3(); auto layer3 = new MenuLayer3();

1
samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.h
View File

@ -106,7 +106,6 @@ class RemoveMenuItemWhenMove : public Layer
public: public:
RemoveMenuItemWhenMove(); RemoveMenuItemWhenMove();
~RemoveMenuItemWhenMove(); ~RemoveMenuItemWhenMove();
virtual bool onTouchBegan(Touch *touch, Event *event); virtual bool onTouchBegan(Touch *touch, Event *event);
virtual void onTouchMoved(Touch *touch, Event *event); virtual void onTouchMoved(Touch *touch, Event *event);