X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-TouchProcessing.cpp;h=b5f0ec9c1d2f52a5ea36bb32b2e17c1e2828886c;hb=d5039e3c8d18f0b0afa1caca6c53d84f6938c8f9;hp=6f1124729f512516ddeaf812c6abc3f22bb64e60;hpb=e61d60833033fe14c46188cbde1005b3f52f7044;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp old mode 100644 new mode 100755 index 6f11247..b5f0ec9 --- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,9 @@ #include #include #include -#include +#include #include +#include using namespace Dali; @@ -57,7 +58,7 @@ struct SignalData touchEvent.time = 0u; touchEvent.points.clear(); - touchedActor = NULL; + touchedActor.Reset(); } bool functorCalled; @@ -117,10 +118,13 @@ struct RemoveActorFunctor : public TouchEventFunctor } }; -Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, Vector2 screenPosition ) +Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, const Vector2& screenPosition ) { Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, state, screenPosition.x, screenPosition.y ) ); + Integration::Point point; + point.SetState( static_cast< PointState::Type >( state ) ); + point.SetScreenPosition( screenPosition ); + touchEvent.points.push_back( point ); return touchEvent; } @@ -152,33 +156,39 @@ int UtcDaliTouchNormalProcessing(void) // Emit a down signal application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) ); + const TouchPoint *point1 = &data.touchEvent.GetPoint(0); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, data.touchEvent.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( localCoordinates, data.touchEvent.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, point1->state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, point1->screen, TEST_LOCATION ); + DALI_TEST_EQUALS( localCoordinates, point1->local, 0.1f, TEST_LOCATION ); data.Reset(); // Emit a motion signal screenCoordinates.x = screenCoordinates.y = 11.0f; actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y ); application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, screenCoordinates ) ); + const TouchPoint *point2 = &data.touchEvent.GetPoint(0); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( TouchPoint::Motion, data.touchEvent.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, data.touchEvent.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( localCoordinates, data.touchEvent.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Motion, point2->state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, point2->screen, TEST_LOCATION ); + DALI_TEST_EQUALS( localCoordinates, point2->local, 0.1f, TEST_LOCATION ); data.Reset(); // Emit an up signal screenCoordinates.x = screenCoordinates.y = 12.0f; actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y ); application.ProcessEvent( GenerateSingleTouch( TouchPoint::Up, screenCoordinates ) ); + + const TouchPoint *point3ptr = &data.touchEvent.GetPoint(0); + TouchPoint point3( point3ptr->deviceId, point3ptr->state, point3ptr->screen.x, point3ptr->screen.y, point3ptr->local.x, point3ptr->local.y ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( TouchPoint::Up, data.touchEvent.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, data.touchEvent.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( localCoordinates, data.touchEvent.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Up, point3.state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, point3.screen, TEST_LOCATION ); + DALI_TEST_EQUALS( localCoordinates, point3.local, 0.1f, TEST_LOCATION ); data.Reset(); // Emit a down signal where the actor is not present @@ -485,6 +495,8 @@ int UtcDaliTouchInterruptedParentConsumer(void) // Remove actor from Stage Stage::GetCurrent().Remove( actor ); + data.Reset(); + rootData.Reset(); // Render and notify application.SendNotification(); @@ -712,9 +724,6 @@ int UtcDaliTouchActorBecomesInsensitiveParentConsumer(void) data.Reset(); rootData.Reset(); - // Remove actor from Stage - Stage::GetCurrent().Remove( actor ); - // Render and notify application.SendNotification(); application.Render(); @@ -724,7 +733,8 @@ int UtcDaliTouchActorBecomesInsensitiveParentConsumer(void) // Emit a motion signal, signalled with an interrupted (should get interrupted even if within root actor) application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) ); - DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( TouchPoint::Interrupted, rootData.touchEvent.points[0].state, TEST_LOCATION ); END_TEST; @@ -953,12 +963,12 @@ int UtcDaliTouchOffscreenRenderTasks(void) // FrameBufferImage for offscreen RenderTask FrameBufferImage frameBufferImage( FrameBufferImage::New( stageSize.width, stageSize.height, Pixel::RGBA8888 ) ); - // Create an image actor to display the FrameBufferImage - ImageActor imageActor ( ImageActor::New( frameBufferImage ) ); - imageActor.SetParentOrigin(ParentOrigin::CENTER); - imageActor.SetSize( stageSize.x, stageSize.y ); - imageActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME - stage.Add( imageActor ); + // Create a renderable actor to display the FrameBufferImage + Actor renderableActor = CreateRenderableActor( frameBufferImage ); + renderableActor.SetParentOrigin(ParentOrigin::CENTER); + renderableActor.SetSize( stageSize.x, stageSize.y ); + renderableActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME + stage.Add( renderableActor ); Actor actor = Actor::New(); actor.SetSize(100.0f, 100.0f); @@ -1000,12 +1010,12 @@ int UtcDaliTouchMultipleRenderableActors(void) Stage stage ( Stage::GetCurrent() ); Vector2 stageSize ( stage.GetSize() ); - Actor parent = ImageActor::New(); + Actor parent = CreateRenderableActor(); parent.SetSize(100.0f, 100.0f); parent.SetAnchorPoint(AnchorPoint::TOP_LEFT); stage.Add(parent); - Actor actor = ImageActor::New(); + Actor actor = CreateRenderableActor(); actor.SetSize(100.0f, 100.0f); actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); parent.Add(actor); @@ -1088,7 +1098,7 @@ int UtcDaliTouchActorRemovedInSignal(void) data.Reset(); // Completely delete the actor - actor = NULL; + actor.Reset(); // Emit event, should not crash and should not receive an event. application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) ); @@ -1145,6 +1155,7 @@ int UtcDaliTouchActorUnStaged(void) // Remove actor from stage Stage::GetCurrent().Remove( actor ); + data.Reset(); // Render and notify application.SendNotification(); @@ -1157,42 +1168,6 @@ int UtcDaliTouchActorUnStaged(void) END_TEST; } -int UtcDaliTouchSystemOverlayActor(void) -{ - TestApplication application; - Dali::Integration::Core& core( application.GetCore() ); - Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() ); - systemOverlay.GetOverlayRenderTasks().CreateTask(); - - // Create an actor and add it to the system overlay. - Actor systemActor = Actor::New(); - systemActor.SetSize(100.0f, 100.0f); - systemActor.SetAnchorPoint(AnchorPoint::TOP_LEFT); - systemOverlay.Add( systemActor ); - - // Create an actor and add it to the stage as per normal, same position and size as systemActor - Actor actor = Actor::New(); - actor.SetSize(100.0f, 100.0f); - actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); - Stage::GetCurrent().Add(actor); - - // Connect to the touch signals. - SignalData data; - TouchEventFunctor functor( data ); - systemActor.TouchedSignal().Connect( &application, functor ); - actor.TouchedSignal().Connect( &application, functor ); - - // Render and notify - application.SendNotification(); - application.Render(); - - // Emit a down signal, the system overlay is drawn last so is at the top, should hit the systemActor. - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); - DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( systemActor == data.touchedActor ); - END_TEST; -} - int UtcDaliTouchLayerConsumesTouch(void) { TestApplication application; @@ -1290,21 +1265,66 @@ int UtcDaliTouchLeaveActorReadded(void) END_TEST; } -int UtcDaliTouchStencil(void) +int UtcDaliTouchClippingActor(void) { TestApplication application; Stage stage = Stage::GetCurrent(); - TextActor actor = TextActor::New(); + Actor actor = Actor::New(); + actor.SetSize( 100.0f, 100.0f ); + actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + stage.Add( actor ); + + Actor clippingActor = Actor::New(); + clippingActor.SetSize( 50.0f, 50.0f ); + clippingActor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); + stage.Add( clippingActor ); + + // Add a child to the clipped region. + Actor clippingChild = Actor::New(); + clippingChild.SetSize( 50.0f, 50.0f ); + clippingChild.SetPosition( 25.0f, 25.0f ); + clippingChild.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + clippingActor.Add( clippingChild ); + + // Render and notify. + application.SendNotification(); + application.Render(); + + // Connect to actor's touched signal. + SignalData data; + TouchEventFunctor functor( data ); + actor.TouchedSignal().Connect( &application, functor ); + + // Emit an event within clipped area - no hit. + application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); + DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); + data.Reset(); + + // Emit an event outside the clipped area but within the actor area, we should have a hit. + application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 60.0f, 60.0f ) ) ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + data.Reset(); + + clippingChild.TouchedSignal().Connect( &application, functor ); + + // Emit an event inside part of the child which is within the clipped area, we should have a hit. + application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 30.0f, 30.0f ) ) ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + data.Reset(); + + END_TEST; +} + +int UtcDaliTouchActorUnstaged(void) +{ + TestApplication application; + + Actor actor = Actor::New(); actor.SetSize(100.0f, 100.0f); actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stage.Add(actor); - - Actor stencil = Actor::New(); - stencil.SetSize(50.0f, 50.0f); - stencil.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stencil.SetDrawMode( DrawMode::STENCIL ); - stage.Add(stencil); + Stage::GetCurrent().Add(actor); // Render and notify application.SendNotification(); @@ -1315,127 +1335,175 @@ int UtcDaliTouchStencil(void) TouchEventFunctor functor( data ); actor.TouchedSignal().Connect( &application, functor ); - // Emit an event within stencil area + // Emit a down signal application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.touchEvent.points[0].hitActor ); data.Reset(); - // Emit an event outside the stencil area but within the actor area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 60.0f, 60.0f ) ) ); - DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); - data.Reset(); + // Render and notify + application.SendNotification(); + application.Render(); + + // Unparent the actor + actor.Unparent(); + // Should receive an interrupted event + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchStencilInActorHierarchy(void) +int UtcDaliTouchParentUnstaged(void) { TestApplication application; - Stage stage = Stage::GetCurrent(); - TextActor parent = TextActor::New(); + Actor parent = Actor::New(); parent.SetSize(100.0f, 100.0f); parent.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stage.Add(parent); + Stage::GetCurrent().Add(parent); - TextActor child = TextActor::New(); - child.SetSize(25.0f, 25.0f); - child.SetAnchorPoint(AnchorPoint::TOP_LEFT); - parent.Add(child); + Actor actor = Actor::New(); + actor.SetSize(100.0f, 100.0f); + actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); + parent.Add(actor); - Actor stencil = Actor::New(); - stencil.SetSize(50.0f, 50.0f); - stencil.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stencil.SetDrawMode( DrawMode::STENCIL ); - stage.Add(stencil); + // Render and notify + application.SendNotification(); + application.Render(); + + // Connect to actor's touched signal + SignalData data; + TouchEventFunctor functor( data ); + actor.TouchedSignal().Connect( &application, functor ); + + // Emit a down signal + application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.touchEvent.points[0].hitActor ); + data.Reset(); // Render and notify application.SendNotification(); application.Render(); - // Connect to touch signals + // Unparent the parent of the touchable actor + parent.Unparent(); + + // Should receive an interrupted event + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION ); + END_TEST; +} + +int UtcDaliTouchActorUnstagedDifferentConsumer(void) +{ + TestApplication application; + + Actor parent = Actor::New(); + parent.SetSize(100.0f, 100.0f); + parent.SetAnchorPoint(AnchorPoint::TOP_LEFT); + Stage::GetCurrent().Add(parent); + + Actor actor = Actor::New(); + actor.SetSize(100.0f, 100.0f); + actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); + parent.Add(actor); + + // Render and notify + application.SendNotification(); + application.Render(); + + // Connect to actor's touched signal + SignalData data; + TouchEventFunctor functor( data, false /* Do not consume */ ); + actor.TouchedSignal().Connect( &application, functor ); + + // Connect to parent's touched signal SignalData parentData; - parent.TouchedSignal().Connect( &application, TouchEventFunctor(parentData) ); - SignalData childData; - child.TouchedSignal().Connect( &application, TouchEventFunctor(childData) ); + TouchEventFunctor parentFunctor( parentData ); + parent.TouchedSignal().Connect( &application, parentFunctor ); - // Emit an event within stencil area + // Emit a down signal application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); - DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( true, childData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.touchEvent.points[0].hitActor ); + DALI_TEST_CHECK( actor == data.touchedActor ); + DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, parentData.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == parentData.touchEvent.points[0].hitActor ); + DALI_TEST_CHECK( parent == parentData.touchedActor ); + data.Reset(); parentData.Reset(); - childData.Reset(); - // Emit an event outside child area and within stencil area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 40.0f, 40.0f ) ) ); + // Render and notify + application.SendNotification(); + application.Render(); + + // Unparent the actor + actor.Unparent(); + + // Should receive an interrupted event for both actor & parent + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, parentData.touchEvent.points[0].state, TEST_LOCATION ); + data.Reset(); parentData.Reset(); - childData.Reset(); - // Emit an event outside stencil are but within parent area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 60.0f, 60.0f ) ) ); - DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION ); - parentData.Reset(); - childData.Reset(); + // Readd actor to parent + parent.Add(actor); - // Readd actor (so that stencil is the first child) - stage.Remove(parent); - application.SendNotification(); - application.Render(); - stage.Add(parent); + // Render and notify application.SendNotification(); application.Render(); - // Redo hit in same area... - - // Emit an event within stencil area + // Emit a motion signal application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 10.0f, 10.0f ) ) ); - DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( true, childData.functorCalled, TEST_LOCATION ); - parentData.Reset(); - childData.Reset(); - - // Emit an event outside child area and within stencil area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 40.0f, 40.0f ) ) ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION ); + data.Reset(); parentData.Reset(); - childData.Reset(); - // Emit an event outside stencil are but within parent area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 60.0f, 60.0f ) ) ); - DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION ); + // Parent is now consumer, connect again to the touched signal of the actor so that it becomes the consumer + SignalData secondData; + TouchEventFunctor secondFunctor( secondData /* Consume */ ); + actor.TouchedSignal().Connect( &application, secondFunctor ); + + // Unparent the actor + actor.Unparent(); + + // Should receive an interrupted event for both actor functors & the parent as well as it was last consumer + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, parentData.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( true, secondData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, secondData.touchEvent.points[0].state, TEST_LOCATION ); + data.Reset(); parentData.Reset(); - childData.Reset(); + secondData.Reset(); END_TEST; } -int UtcDaliTouchMultipleStencils(void) +int UtcDaliTouchInterruptedDifferentConsumer(void) { TestApplication application; - Stage stage = Stage::GetCurrent(); + Actor rootActor( Stage::GetCurrent().GetRootLayer() ); + + Actor parent = Actor::New(); + parent.SetSize(100.0f, 100.0f); + parent.SetAnchorPoint(AnchorPoint::TOP_LEFT); + Stage::GetCurrent().Add(parent); - TextActor actor = TextActor::New(); + Actor actor = Actor::New(); actor.SetSize(100.0f, 100.0f); actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stage.Add(actor); - - Actor stencil = Actor::New(); - stencil.SetSize(50.0f, 50.0f); - stencil.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stencil.SetDrawMode( DrawMode::STENCIL ); - stage.Add(stencil); - - Actor stencil2 = Actor::New(); - stencil2.SetSize(50.0f, 50.0f); - stencil2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stencil2.SetDrawMode( DrawMode::STENCIL ); - stencil2.SetPosition(50.0f, 50.0f); - stage.Add(stencil2); + parent.Add(actor); // Render and notify application.SendNotification(); @@ -1443,61 +1511,91 @@ int UtcDaliTouchMultipleStencils(void) // Connect to actor's touched signal SignalData data; - TouchEventFunctor functor( data ); + TouchEventFunctor functor( data, false /* Do not consume */ ); actor.TouchedSignal().Connect( &application, functor ); - // Emit an event within stencil area + // Connect to parent's touched signal + SignalData parentData; + TouchEventFunctor parentFunctor( parentData, false /* Do not consume */ ); + parent.TouchedSignal().Connect( &application, parentFunctor ); + + // Connect to root's touched signal and consume + SignalData rootData; + TouchEventFunctor rootFunctor( rootData ); + rootActor.TouchedSignal().Connect( &application, rootFunctor ); + + // Emit a down signal application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.touchEvent.points[0].hitActor ); + DALI_TEST_CHECK( actor == data.touchedActor ); + DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, parentData.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == parentData.touchEvent.points[0].hitActor ); + DALI_TEST_CHECK( parent == parentData.touchedActor ); + DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Down, rootData.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == rootData.touchEvent.points[0].hitActor ); + DALI_TEST_CHECK( rootActor == rootData.touchedActor ); data.Reset(); + parentData.Reset(); + rootData.Reset(); - // Emit an event inside the second stencil area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 60.0f, 60.0f ) ) ); - DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - data.Reset(); + // Root is now consumer, connect to the touched signal of the parent so that it becomes the consumer + SignalData secondData; + TouchEventFunctor secondFunctor( secondData /* Consume */ ); + parent.TouchedSignal().Connect( &application, secondFunctor ); - // Emit an event outside both stencil areas but within the actor area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 60.0f ) ) ); - DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); + // Emit an interrupted signal, all three should STILL be called + application.ProcessEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 10.0f, 10.0f ) ) ); + DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, parentData.touchEvent.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); + DALI_TEST_EQUALS( TouchPoint::Interrupted, rootData.touchEvent.points[0].state, TEST_LOCATION ); data.Reset(); + parentData.Reset(); + rootData.Reset(); END_TEST; } -int UtcDaliTouchStencilNonRenderableActor(void) +int UtcDaliTouchDataConvert(void) { TestApplication application; - Stage stage = Stage::GetCurrent(); Actor actor = Actor::New(); actor.SetSize(100.0f, 100.0f); actor.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stage.Add(actor); - - Actor stencil = Actor::New(); - stencil.SetSize(50.0f, 50.0f); - stencil.SetAnchorPoint(AnchorPoint::TOP_LEFT); - stencil.SetDrawMode( DrawMode::STENCIL ); - stage.Add(stencil); + Stage::GetCurrent().Add(actor); // Render and notify application.SendNotification(); application.Render(); - // Connect to actor's touched signal + // Connect to actor's touch signal SignalData data; - TouchEventFunctor functor( data ); - actor.TouchedSignal().Connect( &application, functor ); + TouchEventFunctor functor(data); + actor.TouchedSignal().Connect(&application, functor); - // Emit an event within stencil area - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) ); - DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - data.Reset(); + Vector2 screenCoordiantes(10.0f, 10.0f); + Vector2 localCoordinates; + actor.ScreenToLocal(localCoordinates.x, localCoordinates.y, screenCoordiantes.x, screenCoordiantes.y); + + // Emit a down signal + application.ProcessEvent(GenerateSingleTouch(TouchPoint::Down, screenCoordiantes)); + Dali::TouchData touchData = Dali::DevelTouchData::Convert(data.touchEvent); + + DALI_TEST_EQUALS( 1u, touchData.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordiantes, touchData.GetScreenPosition(0), TEST_LOCATION ); + DALI_TEST_EQUALS( localCoordinates, touchData.GetLocalPosition(0), 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, touchData.GetState(0), TEST_LOCATION ); + DALI_TEST_EQUALS( actor, touchData.GetHitActor(0), TEST_LOCATION ); - // Emit an event outside the stencil area but within the actor area, we should have a hit! - application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 60.0f, 60.0f ) ) ); - DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); data.Reset(); END_TEST; -} + +} \ No newline at end of file