(Touch) Ensure touch-events are cleared before emitting to stage and documentation...

[problem]     Stage signal has the wrong touch-event information.
[cause]       We change it when we emit the interrupted event for the original down actor.
[solution]    Revert to original.

Change-Id: Ib93364a8df74204c5f15c8d33e264189dc1a752c
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/capi/dali/public-api/actors/actor.h b/capi/dali/public-api/actors/actor.h
index b9b5fcf3dc5f4d22542844b4bc057bf429e12478..8649edd8b007cbf12ffea5d811f07f6ed636a69f 100644 (file)
--- a/capi/dali/public-api/actors/actor.h
+++ b/capi/dali/public-api/actors/actor.h
@@ -202,7 +202,10 @@ typedef ActorContainer::const_iterator ActorConstIter; ///< Const iterator for D
  * - Interrupted State
  *   - If a system event occurs which interrupts the touch processing, then the last primary hit
  *     actor's touch signals are emitted with an "Interrupted" state.
- *   - If the last primary hit actor, or one of its parents, is no longer touchable, then its touch signals are also emitted with an "Interrupted" state.
+ *   - If the last primary hit actor, or one of its parents, is no longer touchable, then its
+ *     touch signals are also emitted with an "Interrupted" state.
+ *   - If the consumed actor on touch-down is not the same as the consumed actor on touch-up, then
+ *     touch signals are also emitted from the touch-down actor with an "Interrupted" state.
  * <h3>Key Events:</h3>
  *
  * Key events are received by an actor once set to grab key events, only one actor can be set as focused.

diff --git a/dali/internal/event/events/touch-event-processor.cpp b/dali/internal/event/events/touch-event-processor.cpp
index bc4e0618f105adb862f1365eed432e3107346757..e561ebca523962f975bccc74f2fe8c07d8af4ce7 100644 (file)
--- a/dali/internal/event/events/touch-event-processor.cpp
+++ b/dali/internal/event/events/touch-event-processor.cpp
@@ -460,6 +460,10 @@ void TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even
           touchEvent.points[0].hitActor = touchDownConsumedActorHandle;
           touchEvent.points[0].state = TouchPoint::Interrupted;
           EmitTouchSignals( touchDownConsumedActorHandle, touchEvent );
+
+          // Restore touch-event to original state
+          touchEvent.points[0].hitActor = primaryHitActor;
+          touchEvent.points[0].state = primaryPointState;
         }
 
         mTouchDownConsumedActor.SetActor( NULL );