dm 7 years ago
parent
commit
a6b90c5a77

+ 1 - 1
examples/Demo/src/TestAlphaHitTest.h

@@ -26,7 +26,7 @@ public:
         sprite->setPosition(content->getSize() / 2);
         sprite->setPosition(content->getSize() / 2);
 
 
         sprite->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestAlphaHitTest::onEvent));
-        sprite->addEventListener(TouchEvent::OUT, CLOSURE(this, &TestAlphaHitTest::onEvent));
+        sprite->addEventListener(TouchEvent::OUTX, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->setTouchChildrenEnabled(false);
         sprite->setTouchChildrenEnabled(false);
 
 
         txt = new TextField;
         txt = new TextField;

+ 2 - 2
examples/Demo/src/TestTouches.h

@@ -22,7 +22,7 @@ public:
         orange->attachTo(content);
         orange->attachTo(content);
         //orange->setAlpha(200);
         //orange->setAlpha(200);
         orange->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestTouches::onOver));
         orange->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestTouches::onOver));
-        orange->addEventListener(TouchEvent::OUT, CLOSURE(this, &TestTouches::onOver));
+        orange->addEventListener(TouchEvent::OUTX, CLOSURE(this, &TestTouches::onOver));
         orange->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &TestTouches::onDownUp));
         orange->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &TestTouches::onDownUp));
         orange->addEventListener(TouchEvent::TOUCH_UP, CLOSURE(this, &TestTouches::onDownUp));
         orange->addEventListener(TouchEvent::TOUCH_UP, CLOSURE(this, &TestTouches::onDownUp));
         orange->addEventListener(TouchEvent::MOVE, CLOSURE(this, &TestTouches::onMove));
         orange->addEventListener(TouchEvent::MOVE, CLOSURE(this, &TestTouches::onMove));
@@ -90,7 +90,7 @@ public:
         spSprite s = safeSpCast<Sprite>(ev->currentTarget);
         spSprite s = safeSpCast<Sprite>(ev->currentTarget);
         spTextField tf = s->getChildT<TextField>("local");
         spTextField tf = s->getChildT<TextField>("local");
 
 
-        if (ev->type != TouchEvent::OUT)
+        if (ev->type != TouchEvent::OUTX)
         {
         {
             TouchEvent* te = safeCast<TouchEvent*>(ev);
             TouchEvent* te = safeCast<TouchEvent*>(ev);
             char str[255];
             char str[255];

+ 1 - 1
examples/Demo/src/test.cpp

@@ -143,7 +143,7 @@ spButton Test::addButton(std::string id, std::string txt)
     });
     });
 
 
 
 
-    button->addEventListener(TouchEvent::OUT, [ = ](Event*)
+    button->addEventListener(TouchEvent::OUTX, [ = ](Event*)
     {
     {
         ptr->addTween(Sprite::TweenAddColor(Color(0, 0, 0, 0)), 300);
         ptr->addTween(Sprite::TweenAddColor(Color(0, 0, 0, 0)), 300);
     });
     });