|
@@ -294,9 +294,6 @@ namespace oxygine
|
|
|
|
|
|
|
|
void Actor::dispatchEvent(Event* event)
|
|
void Actor::dispatchEvent(Event* event)
|
|
|
{
|
|
{
|
|
|
- EventDispatcher::dispatchEvent(event);
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if (event->type == TouchEvent::MOVE)
|
|
if (event->type == TouchEvent::MOVE)
|
|
|
{
|
|
{
|
|
|
TouchEvent* te = safeCast<TouchEvent*>(event);
|
|
TouchEvent* te = safeCast<TouchEvent*>(event);
|
|
@@ -343,6 +340,9 @@ namespace oxygine
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ EventDispatcher::dispatchEvent(event);
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
if (!event->stopsImmediatePropagation && event->bubbles && !event->stopsPropagation)
|
|
if (!event->stopsImmediatePropagation && event->bubbles && !event->stopsPropagation)
|
|
|
{
|
|
{
|
|
|
if (_parent)
|
|
if (_parent)
|