From c71de3ef6200850b81ed44cb71e1260aab4ccc8c Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 14 Aug 2020 11:49:49 +0100 Subject: [PATCH] Renamed TouchData to TouchEvent Change-Id: I89458424fc73f0eb29fdfe2b525fd075a6b502bf --- automated-tests/src/dali/CMakeLists.txt | 2 +- ...touch-data-utils.h => test-touch-event-utils.h} | 12 +- automated-tests/src/dali/utc-Dali-Actor.cpp | 6 +- .../src/dali/utc-Dali-LongPressGestureDetector.cpp | 10 +- .../src/dali/utc-Dali-PanGestureDetector.cpp | 4 +- .../src/dali/utc-Dali-PinchGestureDetector.cpp | 4 +- .../src/dali/utc-Dali-RotationGestureDetector.cpp | 4 +- automated-tests/src/dali/utc-Dali-Scene.cpp | 61 ++- automated-tests/src/dali/utc-Dali-Stage.cpp | 118 ++--- .../src/dali/utc-Dali-TapGestureDetector.cpp | 6 +- ...Processing.cpp => utc-Dali-TouchProcessing.cpp} | 524 ++++++++++----------- dali/devel-api/common/stage.h | 6 +- dali/integration-api/core.h | 2 +- .../{touch-data-integ.cpp => touch-integ.cpp} | 12 +- .../events/{touch-data-integ.h => touch-integ.h} | 12 +- dali/integration-api/file.list | 6 +- dali/integration-api/scene.h | 6 +- dali/internal/common/core-impl.h | 2 +- dali/internal/event/actors/actor-impl.cpp | 6 +- dali/internal/event/actors/actor-impl.h | 8 +- dali/internal/event/common/scene-impl.cpp | 2 +- dali/internal/event/common/scene-impl.h | 2 +- dali/internal/event/common/stage-impl.cpp | 6 +- dali/internal/event/common/stage-impl.h | 4 +- .../{touch-data-impl.cpp => touch-event-impl.cpp} | 54 +-- .../{touch-data-impl.h => touch-event-impl.h} | 72 +-- .../event/events/touch-event-processor.cpp | 74 +-- dali/internal/file.list | 2 +- dali/public-api/actors/actor.cpp | 2 +- dali/public-api/actors/actor.h | 8 +- dali/public-api/dali-core.h | 2 +- .../events/{touch-data.cpp => touch-event.cpp} | 44 +- .../events/{touch-data.h => touch-event.h} | 78 +-- dali/public-api/file.list | 4 +- dali/public-api/signals/dali-signal.h | 2 +- 35 files changed, 582 insertions(+), 585 deletions(-) rename automated-tests/src/dali/dali-test-suite-utils/{test-touch-data-utils.h => test-touch-event-utils.h} (77%) rename automated-tests/src/dali/{utc-Dali-TouchDataProcessing.cpp => utc-Dali-TouchProcessing.cpp} (78%) rename dali/integration-api/events/{touch-data-integ.cpp => touch-integ.cpp} (66%) rename dali/integration-api/events/{touch-data-integ.h => touch-integ.h} (75%) rename dali/internal/event/events/{touch-data-impl.cpp => touch-event-impl.cpp} (62%) mode change 100755 => 100644 rename dali/internal/event/events/{touch-data-impl.h => touch-event-impl.h} (69%) mode change 100755 => 100644 rename dali/public-api/events/{touch-data.cpp => touch-event.cpp} (58%) rename dali/public-api/events/{touch-data.h => touch-event.h} (84%) mode change 100755 => 100644 diff --git a/automated-tests/src/dali/CMakeLists.txt b/automated-tests/src/dali/CMakeLists.txt index 5c90a0e..fb41a62 100644 --- a/automated-tests/src/dali/CMakeLists.txt +++ b/automated-tests/src/dali/CMakeLists.txt @@ -93,7 +93,7 @@ SET(TC_SOURCES utc-Dali-Thread.cpp utc-Dali-ThreadPool.cpp utc-Dali-TouchEventCombiner.cpp - utc-Dali-TouchDataProcessing.cpp + utc-Dali-TouchProcessing.cpp utc-Dali-TypeRegistry.cpp utc-Dali-CSharp-TypeRegistry.cpp utc-Dali-Uint16Pair.cpp diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h b/automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h similarity index 77% rename from automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h rename to automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h index a259179..ef8cadc 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h @@ -1,5 +1,5 @@ -#ifndef TEST_TOUCH_DATA_UTILS_H -#define TEST_TOUCH_DATA_UTILS_H +#ifndef TEST_TOUCH_EVENT_UTILS_H +#define TEST_TOUCH_EVENT_UTILS_H /* * Copyright (c) 2020 Samsung Electronics Co., Ltd. @@ -24,14 +24,14 @@ * Functor to be connected to an Actor's TouchSignal. * Allows the user to specify whether the functor should return true (consumed) or false. */ -struct TouchDataFunctorConsumeSetter +struct TouchEventFunctorConsumeSetter { - TouchDataFunctorConsumeSetter( bool& consume ) + TouchEventFunctorConsumeSetter( bool& consume ) : mConsume( consume ) { } - bool operator()(Dali::Actor actor, const Dali::TouchData& touch) + bool operator()(Dali::Actor actor, const Dali::TouchEvent& touch) { return mConsume; } @@ -40,5 +40,5 @@ private: bool& mConsume; }; -#endif // TEST_TOUCH_DATA_UTILS_H +#endif // TEST_TOUCH_EVENT_UTILS_H diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp index c9d7ea3..3e63ef4 100644 --- a/automated-tests/src/dali/utc-Dali-Actor.cpp +++ b/automated-tests/src/dali/utc-Dali-Actor.cpp @@ -89,21 +89,21 @@ struct TestConstraintRef }; -static bool TestTouchCallback(Actor actor, const TouchData& touchData ) +static bool TestTouchCallback(Actor, const TouchEvent&) { gTouchCallBackCalled = true; return true; END_TEST; } -static bool TestTouchCallback2(Actor actor, const TouchData& touchData ) +static bool TestTouchCallback2(Actor, const TouchEvent&) { gTouchCallBackCalled2 = true; return true; END_TEST; } -static bool TestTouchCallback3(Actor actor, const TouchData& touchData ) +static bool TestTouchCallback3(Actor, const TouchEvent&) { gTouchCallBackCalled3 = true; return true; diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp index a95c166..20c821e 100644 --- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include using namespace Dali; @@ -115,9 +115,9 @@ struct UnstageActorFunctor : public GestureReceivedFunctor }; // Functor for receiving a touch event -struct TouchDataFunctor +struct TouchEventFunctor { - bool operator()(Actor actor, Dali::TouchData touch) + bool operator()(Actor actor, Dali::TouchEvent touch) { //For line coverage unsigned int points = touch.GetPointCount(); @@ -207,7 +207,7 @@ int UtcDaliLongPressGestureDetectorNew(void) detector.Attach(actor); - TouchDataFunctor touchFunctor; + TouchEventFunctor touchFunctor; actor.TouchSignal().Connect(&application, touchFunctor); Integration::TouchEvent touchEvent(1); @@ -1001,7 +1001,7 @@ int UtcDaliLongPressGestureInterruptedWhenTouchConsumed(void) application.GetScene().Add(actor); bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); + TouchEventFunctorConsumeSetter touchFunctor(consume); actor.TouchSignal().Connect(&application,touchFunctor); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp index fd9d240..b0e245e 100644 --- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace Dali; @@ -2845,7 +2845,7 @@ int UtcDaliPanGestureInterruptedWhenTouchConsumed(void) application.GetScene().Add(actor); bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); + TouchEventFunctorConsumeSetter touchFunctor(consume); actor.TouchSignal().Connect(&application,touchFunctor); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp index 93d5c8b..3ba550d 100644 --- a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include using namespace Dali; @@ -1113,7 +1113,7 @@ int UtcDaliPinchGestureInterruptedWhenTouchConsumed(void) application.GetScene().Add(actor); bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); + TouchEventFunctorConsumeSetter touchFunctor(consume); actor.TouchSignal().Connect(&application,touchFunctor); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp index 75653c4..7c50017 100644 --- a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace Dali; @@ -1103,7 +1103,7 @@ int UtcDaliRotationGestureInterruptedWhenTouchConsumed(void) application.GetScene().Add(actor); bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); + TouchEventFunctorConsumeSetter touchFunctor(consume); actor.TouchSignal().Connect(&application,touchFunctor); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp index 374928f..7da86d9 100644 --- a/automated-tests/src/dali/utc-Dali-Scene.cpp +++ b/automated-tests/src/dali/utc-Dali-Scene.cpp @@ -103,13 +103,13 @@ struct TouchedSignalData functorCalled = false; createNewScene = false; newSceneCreated = false; - receivedTouchData.Reset(); + receivedTouchEvent.Reset(); } bool functorCalled; bool createNewScene; bool newSceneCreated; - TouchData receivedTouchData; + TouchEvent receivedTouchEvent; }; // Functor that sets the data when touched signal is received @@ -117,11 +117,10 @@ struct TouchFunctor { TouchFunctor( TouchedSignalData& data ) : signalData( data ) { } - void operator()( const TouchData& touch ) + void operator()( const TouchEvent& touch ) { signalData.functorCalled = true; - Dali::TouchData touchData (touch); - signalData.receivedTouchData = touchData; + signalData.receivedTouchEvent = touch; if ( signalData.createNewScene ) { @@ -226,7 +225,7 @@ void GenerateTouch( TestApplication& application, PointState::Type state, const application.ProcessEvent( touchEvent ); } -bool DummyTouchCallback( Actor actor, const TouchData& touch ) +bool DummyTouchCallback( Actor actor, const TouchEvent& touch ) { return true; } @@ -643,15 +642,15 @@ int UtcDaliSceneTouchSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -672,8 +671,8 @@ int UtcDaliSceneTouchSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); data.Reset(); GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion @@ -684,8 +683,8 @@ int UtcDaliSceneTouchSignalP(void) GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -700,7 +699,7 @@ int UtcDaliSceneTouchSignalP(void) touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); // 2nd point @@ -731,7 +730,7 @@ int UtcDaliSceneTouchSignalP(void) touchEvent.points[0].SetState( PointState::UP ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); } END_TEST; @@ -758,8 +757,8 @@ int UtcDaliSceneTouchSignalN(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0)); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0)); data.Reset(); @@ -773,8 +772,8 @@ int UtcDaliSceneTouchSignalN(void) GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0)); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0)); data.Reset(); } @@ -795,30 +794,30 @@ int UtcDaliSceneTouchSignalN(void) GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); data.Reset(); GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN ); data.Reset(); GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); // Check that getting info about a non-existent point returns an empty handle - Actor actor = data.receivedTouchData.GetHitActor( 1 ); + Actor actor = data.receivedTouchEvent.GetHitActor( 1 ); DALI_TEST_CHECK( !actor ); data.Reset(); diff --git a/automated-tests/src/dali/utc-Dali-Stage.cpp b/automated-tests/src/dali/utc-Dali-Stage.cpp index 4ea5f5a..4131d4b 100644 --- a/automated-tests/src/dali/utc-Dali-Stage.cpp +++ b/automated-tests/src/dali/utc-Dali-Stage.cpp @@ -155,11 +155,11 @@ struct TouchSignalData { functorCalled = false; - receivedTouchData.Reset(); + receivedTouchEvent.Reset(); } bool functorCalled; - TouchData receivedTouchData; + TouchEvent receivedTouchEvent; }; // Functor that sets the data when touched signal is received @@ -167,11 +167,11 @@ struct TouchFunctor { TouchFunctor( TouchSignalData& data ) : signalData( data ) { } - void operator()( const TouchData& touch ) + void operator()( const TouchEvent& touch ) { signalData.functorCalled = true; - TouchData handle(touch); - signalData.receivedTouchData = handle; + TouchEvent handle(touch); + signalData.receivedTouchEvent = handle; } void operator()() @@ -214,7 +214,7 @@ struct WheelEventReceivedFunctor WheelEventSignalData& signalData; }; -bool DummyTouchCallback( Actor actor, const TouchData& touch ) +bool DummyTouchCallback( Actor actor, const TouchEvent& touch ) { return true; } @@ -996,15 +996,15 @@ int UtcDaliStageTouchedSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -1026,8 +1026,8 @@ int UtcDaliStageTouchedSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion @@ -1038,8 +1038,8 @@ int UtcDaliStageTouchedSignalP(void) GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -1054,7 +1054,7 @@ int UtcDaliStageTouchedSignalP(void) touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); // 2nd point @@ -1064,7 +1064,7 @@ int UtcDaliStageTouchedSignalP(void) touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( (bool)data.receivedTouchData, false, TEST_LOCATION ); + DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION ); data.Reset(); // Primary point is up @@ -1072,7 +1072,7 @@ int UtcDaliStageTouchedSignalP(void) touchEvent.points[1].SetState( PointState::STATIONARY ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( (bool)data.receivedTouchData, false, TEST_LOCATION ); + DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION ); data.Reset(); // Remove 1st point now, 2nd point is now in motion @@ -1081,14 +1081,14 @@ int UtcDaliStageTouchedSignalP(void) touchEvent.points[0].SetScreenPosition( Vector2( 150.0f, 50.0f ) ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( (bool)data.receivedTouchData, false, TEST_LOCATION ); + DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION ); data.Reset(); // Final point Up touchEvent.points[0].SetState( PointState::UP ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); } END_TEST; @@ -1115,8 +1115,8 @@ int UtcDaliStageTouchedSignalN(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); // Confirm there is no signal when the touchpoint is only moved. @@ -1129,8 +1129,8 @@ int UtcDaliStageTouchedSignalN(void) GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -1151,30 +1151,30 @@ int UtcDaliStageTouchedSignalN(void) GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); data.Reset(); GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN ); data.Reset(); GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); // Check that getting info about a non-existent point causes an assert. - DALI_TEST_EQUALS( data.receivedTouchData.GetState( 1 ), PointState::FINISHED, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetState( 1 ), PointState::FINISHED, TEST_LOCATION ); data.Reset(); } @@ -1201,15 +1201,15 @@ int UtcDaliStageTouchSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -1230,8 +1230,8 @@ int UtcDaliStageTouchSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); data.Reset(); GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion @@ -1242,8 +1242,8 @@ int UtcDaliStageTouchSignalP(void) GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -1258,7 +1258,7 @@ int UtcDaliStageTouchSignalP(void) touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); // 2nd point @@ -1289,7 +1289,7 @@ int UtcDaliStageTouchSignalP(void) touchEvent.points[0].SetState( PointState::UP ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); } END_TEST; @@ -1321,8 +1321,8 @@ int UtcDaliStageTouchSignalN(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0)); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0)); DALI_TEST_EQUALS( true, data2.functorCalled, TEST_LOCATION ); @@ -1339,8 +1339,8 @@ int UtcDaliStageTouchSignalN(void) GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0)); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0)); data.Reset(); } @@ -1361,30 +1361,30 @@ int UtcDaliStageTouchSignalN(void) GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); data.Reset(); GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN ); data.Reset(); GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); // Check that getting info about a non-existent point returns an empty handle - Actor actor = data.receivedTouchData.GetHitActor( 1 ); + Actor actor = data.receivedTouchEvent.GetHitActor( 1 ); DALI_TEST_CHECK( !actor ); data.Reset(); diff --git a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp index 4c449c6..c6b8858 100644 --- a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include using namespace Dali; @@ -108,7 +108,7 @@ struct UnstageActorFunctor : public GestureReceivedFunctor // Functor for receiving a touch event struct TouchEventFunctor { - bool operator()(Actor actor, const TouchData& touch) + bool operator()(Actor actor, const TouchEvent& touch) { //For line coverage unsigned int points = touch.GetPointCount(); @@ -921,7 +921,7 @@ int UtcDaliTapGestureInterruptedWhenTouchConsumed(void) application.GetScene().Add(actor); bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); + TouchEventFunctorConsumeSetter touchFunctor(consume); actor.TouchSignal().Connect(&application,touchFunctor); // Render and notify diff --git a/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp similarity index 78% rename from automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp rename to automated-tests/src/dali/utc-Dali-TouchProcessing.cpp index c6230fe..8cdf264 100644 --- a/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp @@ -19,20 +19,20 @@ #include #include +#include #include -#include #include #include #include using namespace Dali; -void utc_dali_touch_data_processing_startup(void) +void utc_dali_touch_processing_startup(void) { test_return_value = TET_UNDEF; } -void utc_dali_touch_data_processing_cleanup(void) +void utc_dali_touch_processing_cleanup(void) { test_return_value = TET_PASS; } @@ -43,22 +43,19 @@ namespace { struct TestPoint { - int32_t deviceId; - PointState::Type state; + int32_t deviceId{-1}; + PointState::Type state{PointState::FINISHED}; Actor hitActor; Vector2 local; Vector2 screen; - float radius; + float radius{0}; Vector2 ellipseRadius; - float pressure; + float pressure{0}; Degree angle; - Device::Class::Type deviceClass; - Device::Subclass::Type deviceSubclass; + Device::Class::Type deviceClass{Device::Class::NONE}; + Device::Subclass::Type deviceSubclass{Device::Subclass::NONE}; - TestPoint() - : deviceId(-1), state(PointState::FINISHED), radius(0), pressure(0) - { - } + TestPoint() = default; static const TestPoint ZERO; }; @@ -70,12 +67,12 @@ struct SignalData { SignalData() : functorCalled( false ), - touchData(), + receivedTouch(), touchedActor() { } - struct TestTouchData + struct TestTouchEvent { unsigned long time; std::vector points; @@ -98,54 +95,54 @@ struct SignalData { functorCalled = false; - touchData.time = 0u; - touchData.points.clear(); + receivedTouch.time = 0u; + receivedTouch.points.clear(); touchedActor.Reset(); } bool functorCalled; - TestTouchData touchData; + TestTouchEvent receivedTouch; Actor touchedActor; }; // Functor that sets the data when called -struct TouchDataFunctor +struct TouchEventFunctor { /** * Constructor. * @param[in] data Reference to the data to store callback information. * @param[in] returnValue What the functor should return. */ - TouchDataFunctor( SignalData& data, bool returnValue = true ) + TouchEventFunctor( SignalData& data, bool returnValue = true ) : signalData( data ), returnValue( returnValue ) { } - bool operator()( Actor actor, const TouchData& touchData ) + bool operator()( Actor actor, const TouchEvent& touch ) { signalData.functorCalled = true; signalData.touchedActor = actor; - signalData.touchData.time = touchData.GetTime(); - signalData.touchData.points.clear(); + signalData.receivedTouch.time = touch.GetTime(); + signalData.receivedTouch.points.clear(); - for( size_t i=0; istate, TEST_LOCATION ); DALI_TEST_EQUALS( screenCoordinates, point1->screen, TEST_LOCATION ); DALI_TEST_EQUALS( localCoordinates, point1->local, 0.1f, TEST_LOCATION ); @@ -313,9 +309,9 @@ int UtcDaliTouchDataNormalProcessing01(void) screenCoordinates.x = screenCoordinates.y = 11.0f; actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y ); application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, screenCoordinates ) ); - const TestPoint *point2 = &data.touchData.GetPoint(0); + const TestPoint *point2 = &data.receivedTouch.GetPoint(0); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, data.touchData.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( 1u, data.receivedTouch.GetPointCount(), TEST_LOCATION ); DALI_TEST_EQUALS( PointState::MOTION, point2->state, TEST_LOCATION ); DALI_TEST_EQUALS( screenCoordinates, point2->screen, TEST_LOCATION ); DALI_TEST_EQUALS( localCoordinates, point2->local, 0.1f, TEST_LOCATION ); @@ -325,9 +321,9 @@ int UtcDaliTouchDataNormalProcessing01(void) screenCoordinates.x = screenCoordinates.y = 12.0f; actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y ); application.ProcessEvent( GenerateSingleTouch( PointState::UP, screenCoordinates ) ); - const TestPoint *point3 = &data.touchData.GetPoint(0); + const TestPoint *point3 = &data.receivedTouch.GetPoint(0); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, data.touchData.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( 1u, data.receivedTouch.GetPointCount(), TEST_LOCATION ); DALI_TEST_EQUALS( PointState::UP, point3->state, TEST_LOCATION ); DALI_TEST_EQUALS( screenCoordinates, point3->screen, TEST_LOCATION ); DALI_TEST_EQUALS( localCoordinates, point3->local, 0.1f, TEST_LOCATION ); @@ -341,7 +337,7 @@ int UtcDaliTouchDataNormalProcessing01(void) } -int UtcDaliTouchDataNormalProcessing02(void) +int UtcDaliTouchEventNormalProcessing02(void) { TestApplication application; @@ -356,7 +352,7 @@ int UtcDaliTouchDataNormalProcessing02(void) // Connect to actor's touched signal HandleData handleData; - TouchDataHandleFunctor functor( handleData ); + TouchEventHandleFunctor functor( handleData ); actor.TouchSignal().Connect( &application, functor ); Vector2 screenCoordinates( 10.0f, 10.0f ); @@ -366,16 +362,16 @@ int UtcDaliTouchDataNormalProcessing02(void) // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, screenCoordinates ) ); DALI_TEST_EQUALS( true, handleData.signalReceived, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, handleData.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, handleData.touchData.GetState(0), TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, handleData.touchData.GetScreenPosition(0), TEST_LOCATION ); - DALI_TEST_EQUALS( localCoordinates, handleData.touchData.GetLocalPosition(0), 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( 1u, handleData.receivedTouchHandle.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, handleData.receivedTouchHandle.GetState(0), TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, handleData.receivedTouchHandle.GetScreenPosition(0), TEST_LOCATION ); + DALI_TEST_EQUALS( localCoordinates, handleData.receivedTouchHandle.GetLocalPosition(0), 0.1f, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataAPINegative(void) +int UtcDaliTouchEventAPINegative(void) { TestApplication application; @@ -411,7 +407,7 @@ int UtcDaliTouchDataAPINegative(void) } -int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) +int UtcDaliTouchEventOutsideCameraNearFarPlanes(void) { TestApplication application; @@ -441,7 +437,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); Vector2 screenCoordinates( sceneSize.x * 0.5f, sceneSize.y * 0.5f ); @@ -497,7 +493,7 @@ int UtcDaliTouchDataOutsideCameraNearFarPlanes(void) END_TEST; } -int UtcDaliTouchDataEmitEmpty(void) +int UtcDaliTouchEventEmitEmpty(void) { TestApplication application; @@ -515,7 +511,7 @@ int UtcDaliTouchDataEmitEmpty(void) END_TEST; } -int UtcDaliTouchDataInterrupted(void) +int UtcDaliTouchEventInterrupted(void) { TestApplication application; @@ -530,19 +526,19 @@ int UtcDaliTouchDataInterrupted(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); // Emit an interrupted signal, we should be signalled regardless of whether there is a hit or not. application.ProcessEvent( GenerateSingleTouch( PointState::INTERRUPTED, Vector2( 200.0f, 200.0f /* Outside actor */ ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); // Emit another interrupted signal, our signal handler should not be called. @@ -551,7 +547,7 @@ int UtcDaliTouchDataInterrupted(void) END_TEST; } -int UtcDaliTouchDataParentConsumer(void) +int UtcDaliTouchEventParentConsumer(void) { TestApplication application; Actor rootActor( application.GetScene().GetRootLayer() ); @@ -567,12 +563,12 @@ int UtcDaliTouchDataParentConsumer(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false ); + TouchEventFunctor functor( data, false ); actor.TouchSignal().Connect( &application, functor ); // Connect to root actor's touched signal SignalData rootData; - TouchDataFunctor rootFunctor( rootData ); // Consumes signal + TouchEventFunctor rootFunctor( rootData ); // Consumes signal rootActor.TouchSignal().Connect( &application, rootFunctor ); Vector2 screenCoordinates( 10.0f, 10.0f ); @@ -584,16 +580,16 @@ int UtcDaliTouchDataParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, screenCoordinates ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, data.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, rootData.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, data.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, rootData.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( actorCoordinates, data.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_EQUALS( rootCoordinates, rootData.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( 1u, data.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( 1u, rootData.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, data.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, rootData.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( actorCoordinates, data.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( rootCoordinates, rootData.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -604,16 +600,16 @@ int UtcDaliTouchDataParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, screenCoordinates ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, data.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, rootData.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::MOTION, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::MOTION, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, data.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, rootData.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( actorCoordinates, data.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_EQUALS( rootCoordinates, rootData.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( 1u, data.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( 1u, rootData.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::MOTION, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::MOTION, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, data.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, rootData.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( actorCoordinates, data.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( rootCoordinates, rootData.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -624,16 +620,16 @@ int UtcDaliTouchDataParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::UP, screenCoordinates ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, data.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, rootData.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::UP, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::UP, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, data.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, rootData.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( actorCoordinates, data.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_EQUALS( rootCoordinates, rootData.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( 1u, data.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( 1u, rootData.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::UP, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::UP, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, data.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, rootData.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( actorCoordinates, data.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( rootCoordinates, rootData.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -643,15 +639,15 @@ int UtcDaliTouchDataParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, screenCoordinates ) ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( 1u, rootData.touchData.GetPointCount(), TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( screenCoordinates, rootData.touchData.points[0].screen, TEST_LOCATION ); - DALI_TEST_EQUALS( rootCoordinates, rootData.touchData.points[0].local, 0.1f, TEST_LOCATION ); - DALI_TEST_CHECK( rootActor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( 1u, rootData.receivedTouch.GetPointCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( screenCoordinates, rootData.receivedTouch.points[0].screen, TEST_LOCATION ); + DALI_TEST_EQUALS( rootCoordinates, rootData.receivedTouch.points[0].local, 0.1f, TEST_LOCATION ); + DALI_TEST_CHECK( rootActor == rootData.receivedTouch.points[0].hitActor ); END_TEST; } -int UtcDaliTouchDataInterruptedParentConsumer(void) +int UtcDaliTouchEventInterruptedParentConsumer(void) { TestApplication application; Actor rootActor( application.GetScene().GetRootLayer() ); @@ -667,22 +663,22 @@ int UtcDaliTouchDataInterruptedParentConsumer(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false ); + TouchEventFunctor functor( data, false ); actor.TouchSignal().Connect( &application, functor ); // Connect to root actor's touched signal SignalData rootData; - TouchDataFunctor rootFunctor( rootData ); // Consumes signal + TouchEventFunctor rootFunctor( rootData ); // Consumes signal rootActor.TouchSignal().Connect( &application, rootFunctor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -690,10 +686,10 @@ int UtcDaliTouchDataInterruptedParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::INTERRUPTED, Vector2( 200.0f, 200.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -701,8 +697,8 @@ int UtcDaliTouchDataInterruptedParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); rootData.Reset(); @@ -719,8 +715,8 @@ int UtcDaliTouchDataInterruptedParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::INTERRUPTED, Vector2( 200.0f, 200.0f /* Outside actor */ ) ) ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( rootActor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( rootActor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -731,7 +727,7 @@ int UtcDaliTouchDataInterruptedParentConsumer(void) END_TEST; } -int UtcDaliTouchDataLeave(void) +int UtcDaliTouchEventLeave(void) { TestApplication application; @@ -746,7 +742,7 @@ int UtcDaliTouchDataLeave(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Set actor to require leave events @@ -755,13 +751,13 @@ int UtcDaliTouchDataLeave(void) // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); // Emit a motion signal outside of actor, should be signalled with a Leave application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 200.0f, 200.0f )) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::LEAVE, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::LEAVE, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); // Another motion outside of actor, no signalling @@ -772,7 +768,7 @@ int UtcDaliTouchDataLeave(void) // Another motion event inside actor, signalled with motion application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 10.0f, 10.0f )) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::MOTION, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::MOTION, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); // We do not want to listen to leave events anymore @@ -785,7 +781,7 @@ int UtcDaliTouchDataLeave(void) END_TEST; } -int UtcDaliTouchDataLeaveParentConsumer(void) +int UtcDaliTouchEventLeaveParentConsumer(void) { TestApplication application; Actor rootActor( application.GetScene().GetRootLayer() ); @@ -801,12 +797,12 @@ int UtcDaliTouchDataLeaveParentConsumer(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false ); + TouchEventFunctor functor( data, false ); actor.TouchSignal().Connect( &application, functor ); // Connect to root actor's touched signal SignalData rootData; - TouchDataFunctor rootFunctor( rootData ); // Consumes signal + TouchEventFunctor rootFunctor( rootData ); // Consumes signal rootActor.TouchSignal().Connect( &application, rootFunctor ); // Set actor to require leave events @@ -817,10 +813,10 @@ int UtcDaliTouchDataLeaveParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -828,10 +824,10 @@ int UtcDaliTouchDataLeaveParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 200.0f, 200.0f )) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::LEAVE, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::LEAVE, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::LEAVE, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::LEAVE, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -839,8 +835,8 @@ int UtcDaliTouchDataLeaveParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 201.0f, 201.0f )) ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::MOTION, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( rootActor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::MOTION, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( rootActor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -848,10 +844,10 @@ int UtcDaliTouchDataLeaveParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 10.0f, 10.0f )) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::MOTION, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::MOTION, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::MOTION, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::MOTION, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -863,11 +859,11 @@ int UtcDaliTouchDataLeaveParentConsumer(void) application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( sceneSize.width + 10.0f, sceneSize.height + 10.0f )) ); DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::LEAVE, rootData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::LEAVE, rootData.receivedTouch.points[0].state, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataActorBecomesInsensitive(void) +int UtcDaliTouchEventActorBecomesInsensitive(void) { TestApplication application; @@ -882,13 +878,13 @@ int UtcDaliTouchDataActorBecomesInsensitive(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); // Change actor to insensitive @@ -897,12 +893,12 @@ int UtcDaliTouchDataActorBecomesInsensitive(void) // Emit a motion signal, signalled with an interrupted application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 200.0f, 200.0f )) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); END_TEST; } -int UtcDaliTouchDataActorBecomesInsensitiveParentConsumer(void) +int UtcDaliTouchEventActorBecomesInsensitiveParentConsumer(void) { TestApplication application; Actor rootActor( application.GetScene().GetRootLayer() ); @@ -918,22 +914,22 @@ int UtcDaliTouchDataActorBecomesInsensitiveParentConsumer(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false ); + TouchEventFunctor functor( data, false ); actor.TouchSignal().Connect( &application, functor ); // Connect to root actor's touched signal SignalData rootData; - TouchDataFunctor rootFunctor( rootData ); // Consumes signal + TouchEventFunctor rootFunctor( rootData ); // Consumes signal rootActor.TouchSignal().Connect( &application, rootFunctor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); data.Reset(); rootData.Reset(); @@ -947,20 +943,20 @@ int UtcDaliTouchDataActorBecomesInsensitiveParentConsumer(void) // Emit a motion signal, signalled with an interrupted (should get interrupted even if within root actor) application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2 ( 200.0f, 200.0f )) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.receivedTouch.points[0].state, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataMultipleLayers(void) +int UtcDaliTouchEventMultipleLayers(void) { TestApplication application; Actor rootActor( application.GetScene().GetRootLayer() ); // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); Layer layer1 ( Layer::New() ); layer1.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); @@ -1072,7 +1068,7 @@ int UtcDaliTouchDataMultipleLayers(void) END_TEST; } -int UtcDaliTouchDataMultipleRenderTasks(void) +int UtcDaliTouchEventMultipleRenderTasks(void) { TestApplication application; Integration::Scene scene ( application.GetScene() ); @@ -1095,7 +1091,7 @@ int UtcDaliTouchDataMultipleRenderTasks(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal @@ -1116,7 +1112,7 @@ int UtcDaliTouchDataMultipleRenderTasks(void) END_TEST; } -int UtcDaliTouchDataMultipleRenderTasksWithChildLayer(void) +int UtcDaliTouchEventMultipleRenderTasksWithChildLayer(void) { TestApplication application; Integration::Scene scene ( application.GetScene() ); @@ -1145,7 +1141,7 @@ int UtcDaliTouchDataMultipleRenderTasksWithChildLayer(void) // Connect to layer's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); layer.TouchSignal().Connect( &application, functor ); @@ -1167,7 +1163,7 @@ int UtcDaliTouchDataMultipleRenderTasksWithChildLayer(void) END_TEST; } -int UtcDaliTouchDataOffscreenRenderTasks(void) +int UtcDaliTouchEventOffscreenRenderTasks(void) { TestApplication application; Integration::Scene scene ( application.GetScene() ); @@ -1207,7 +1203,7 @@ int UtcDaliTouchDataOffscreenRenderTasks(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal @@ -1217,7 +1213,7 @@ int UtcDaliTouchDataOffscreenRenderTasks(void) END_TEST; } -int UtcDaliTouchDataMultipleRenderableActors(void) +int UtcDaliTouchEventMultipleRenderableActors(void) { TestApplication application; Integration::Scene scene ( application.GetScene() ); @@ -1239,7 +1235,7 @@ int UtcDaliTouchDataMultipleRenderableActors(void) // Connect to layer's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); parent.TouchSignal().Connect( &application, functor ); actor.TouchSignal().Connect( &application, functor ); @@ -1250,7 +1246,7 @@ int UtcDaliTouchDataMultipleRenderableActors(void) END_TEST; } -int UtcDaliTouchDataActorRemovedInSignal(void) +int UtcDaliTouchEventActorRemovedInSignal(void) { TestApplication application; @@ -1319,7 +1315,7 @@ int UtcDaliTouchDataActorRemovedInSignal(void) END_TEST; } -int UtcDaliTouchDataActorSignalNotConsumed(void) +int UtcDaliTouchEventActorSignalNotConsumed(void) { TestApplication application; @@ -1334,7 +1330,7 @@ int UtcDaliTouchDataActorSignalNotConsumed(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false ); + TouchEventFunctor functor( data, false ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal @@ -1343,7 +1339,7 @@ int UtcDaliTouchDataActorSignalNotConsumed(void) END_TEST; } -int UtcDaliTouchDataActorRemovedFromScene(void) +int UtcDaliTouchEventActorRemovedFromScene(void) { TestApplication application; @@ -1358,7 +1354,7 @@ int UtcDaliTouchDataActorRemovedFromScene(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal @@ -1381,7 +1377,7 @@ int UtcDaliTouchDataActorRemovedFromScene(void) END_TEST; } -int UtcDaliTouchDataLayerConsumesTouch(void) +int UtcDaliTouchEventLayerConsumesTouch(void) { TestApplication application; @@ -1396,7 +1392,7 @@ int UtcDaliTouchDataLayerConsumesTouch(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Add a layer to overlap the actor @@ -1432,7 +1428,7 @@ int UtcDaliTouchDataLayerConsumesTouch(void) END_TEST; } -int UtcDaliTouchDataLeaveActorReadded(void) +int UtcDaliTouchEventLeaveActorReadded(void) { TestApplication application; Integration::Scene scene = application.GetScene(); @@ -1451,7 +1447,7 @@ int UtcDaliTouchDataLeaveActorReadded(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down and motion @@ -1472,13 +1468,13 @@ int UtcDaliTouchDataLeaveActorReadded(void) // Emit a motion outside the actor's bounds application.ProcessEvent( GenerateSingleTouch( PointState::MOTION, Vector2( 200.0f, 200.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::LEAVE, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::LEAVE, data.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); END_TEST; } -int UtcDaliTouchDataClippedActor(void) +int UtcDaliTouchEventClippedActor(void) { TestApplication application; Integration::Scene scene = application.GetScene(); @@ -1507,7 +1503,7 @@ int UtcDaliTouchDataClippedActor(void) // Connect to actor's touch signal. SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit an event within clipped area - no hit. @@ -1530,7 +1526,7 @@ int UtcDaliTouchDataClippedActor(void) END_TEST; } -int UtcDaliTouchDataActorUnparented(void) +int UtcDaliTouchEventActorUnparented(void) { TestApplication application; @@ -1545,14 +1541,14 @@ int UtcDaliTouchDataActorUnparented(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); data.Reset(); // Render and notify @@ -1564,11 +1560,11 @@ int UtcDaliTouchDataActorUnparented(void) // Should receive an interrupted event DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataParentRemovedFromScene(void) +int UtcDaliTouchEventParentRemovedFromScene(void) { TestApplication application; @@ -1588,14 +1584,14 @@ int UtcDaliTouchDataParentRemovedFromScene(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); data.Reset(); // Render and notify @@ -1607,11 +1603,11 @@ int UtcDaliTouchDataParentRemovedFromScene(void) // Should receive an interrupted event DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataActorRemovedFromSceneDifferentConsumer(void) +int UtcDaliTouchEventActorRemovedFromSceneDifferentConsumer(void) { TestApplication application; @@ -1631,23 +1627,23 @@ int UtcDaliTouchDataActorRemovedFromSceneDifferentConsumer(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false /* Do not consume */ ); + TouchEventFunctor functor( data, false /* Do not consume */ ); actor.TouchSignal().Connect( &application, functor ); // Connect to parent's touched signal SignalData parentData; - TouchDataFunctor parentFunctor( parentData ); + TouchEventFunctor parentFunctor( parentData ); parent.TouchSignal().Connect( &application, parentFunctor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); DALI_TEST_CHECK( actor == data.touchedActor ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, parentData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == parentData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, parentData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == parentData.receivedTouch.points[0].hitActor ); DALI_TEST_CHECK( parent == parentData.touchedActor ); data.Reset(); parentData.Reset(); @@ -1661,9 +1657,9 @@ int UtcDaliTouchDataActorRemovedFromSceneDifferentConsumer(void) // Should receive an interrupted event for both actor & parent DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, parentData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, parentData.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); parentData.Reset(); @@ -1683,7 +1679,7 @@ int UtcDaliTouchDataActorRemovedFromSceneDifferentConsumer(void) // Parent is now consumer, connect again to the touched signal of the actor so that it becomes the consumer SignalData secondData; - TouchDataFunctor secondFunctor( secondData /* Consume */ ); + TouchEventFunctor secondFunctor( secondData /* Consume */ ); actor.TouchSignal().Connect( &application, secondFunctor ); // Unparent the actor @@ -1691,11 +1687,11 @@ int UtcDaliTouchDataActorRemovedFromSceneDifferentConsumer(void) // 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( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, parentData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, parentData.receivedTouch.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, secondData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, secondData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, secondData.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); parentData.Reset(); secondData.Reset(); @@ -1703,7 +1699,7 @@ int UtcDaliTouchDataActorRemovedFromSceneDifferentConsumer(void) END_TEST; } -int UtcDaliTouchDataInterruptedDifferentConsumer(void) +int UtcDaliTouchEventInterruptedDifferentConsumer(void) { TestApplication application; Actor rootActor( application.GetScene().GetRootLayer() ); @@ -1724,32 +1720,32 @@ int UtcDaliTouchDataInterruptedDifferentConsumer(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data, false /* Do not consume */ ); + TouchEventFunctor functor( data, false /* Do not consume */ ); actor.TouchSignal().Connect( &application, functor ); // Connect to parent's touched signal SignalData parentData; - TouchDataFunctor parentFunctor( parentData, false /* Do not consume */ ); + TouchEventFunctor parentFunctor( parentData, false /* Do not consume */ ); parent.TouchSignal().Connect( &application, parentFunctor ); // Connect to root's touched signal and consume SignalData rootData; - TouchDataFunctor rootFunctor( rootData ); + TouchEventFunctor rootFunctor( rootData ); rootActor.TouchSignal().Connect( &application, rootFunctor ); // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == data.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == data.receivedTouch.points[0].hitActor ); DALI_TEST_CHECK( actor == data.touchedActor ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, parentData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == parentData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, parentData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == parentData.receivedTouch.points[0].hitActor ); DALI_TEST_CHECK( parent == parentData.touchedActor ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, rootData.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_CHECK( actor == rootData.touchData.points[0].hitActor ); + DALI_TEST_EQUALS( PointState::DOWN, rootData.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_CHECK( actor == rootData.receivedTouch.points[0].hitActor ); DALI_TEST_CHECK( rootActor == rootData.touchedActor ); data.Reset(); parentData.Reset(); @@ -1757,17 +1753,17 @@ int UtcDaliTouchDataInterruptedDifferentConsumer(void) // Root is now consumer, connect to the touched signal of the parent so that it becomes the consumer SignalData secondData; - TouchDataFunctor secondFunctor( secondData /* Consume */ ); + TouchEventFunctor secondFunctor( secondData /* Consume */ ); parent.TouchSignal().Connect( &application, secondFunctor ); // Emit an interrupted signal, all three should STILL be called application.ProcessEvent( GenerateSingleTouch( PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, data.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, data.receivedTouch.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, parentData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, parentData.receivedTouch.points[0].state, TEST_LOCATION ); DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.touchData.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::INTERRUPTED, rootData.receivedTouch.points[0].state, TEST_LOCATION ); data.Reset(); parentData.Reset(); rootData.Reset(); @@ -1775,7 +1771,7 @@ int UtcDaliTouchDataInterruptedDifferentConsumer(void) END_TEST; } -int UtcDaliTouchDataGetRadius(void) +int UtcDaliTouchEventGetRadius(void) { TestApplication application; @@ -1790,7 +1786,7 @@ int UtcDaliTouchDataGetRadius(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal with an angle @@ -1798,15 +1794,15 @@ int UtcDaliTouchDataGetRadius(void) touchEvent.points[ 0 ].SetRadius( 100.0f ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( 100.0f, data.touchData.points[0].radius, TEST_LOCATION ); - DALI_TEST_EQUALS( 100.0f, data.touchData.points[0].ellipseRadius.x, TEST_LOCATION ); - DALI_TEST_EQUALS( 100.0f, data.touchData.points[0].ellipseRadius.y, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( 100.0f, data.receivedTouch.points[0].radius, TEST_LOCATION ); + DALI_TEST_EQUALS( 100.0f, data.receivedTouch.points[0].ellipseRadius.x, TEST_LOCATION ); + DALI_TEST_EQUALS( 100.0f, data.receivedTouch.points[0].ellipseRadius.y, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataGetEllipseRadius(void) +int UtcDaliTouchEventGetEllipseRadius(void) { TestApplication application; @@ -1821,7 +1817,7 @@ int UtcDaliTouchDataGetEllipseRadius(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal with an angle @@ -1829,15 +1825,15 @@ int UtcDaliTouchDataGetEllipseRadius(void) touchEvent.points[ 0 ].SetRadius( 100.0f, Vector2( 20.0f, 10.0f ) ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( 100.0f, data.touchData.points[0].radius, TEST_LOCATION ); - DALI_TEST_EQUALS( 20.0f, data.touchData.points[0].ellipseRadius.x, TEST_LOCATION ); - DALI_TEST_EQUALS( 10.0f, data.touchData.points[0].ellipseRadius.y, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( 100.0f, data.receivedTouch.points[0].radius, TEST_LOCATION ); + DALI_TEST_EQUALS( 20.0f, data.receivedTouch.points[0].ellipseRadius.x, TEST_LOCATION ); + DALI_TEST_EQUALS( 10.0f, data.receivedTouch.points[0].ellipseRadius.y, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataGetAngle(void) +int UtcDaliTouchEventGetAngle(void) { TestApplication application; @@ -1852,7 +1848,7 @@ int UtcDaliTouchDataGetAngle(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal with an angle @@ -1860,13 +1856,13 @@ int UtcDaliTouchDataGetAngle(void) touchEvent.points[ 0 ].SetAngle( Degree( 90.0f ) ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( Degree( 90.0f ), data.touchData.points[0].angle, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( Degree( 90.0f ), data.receivedTouch.points[0].angle, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataGetPressure(void) +int UtcDaliTouchEventGetPressure(void) { TestApplication application; @@ -1881,7 +1877,7 @@ int UtcDaliTouchDataGetPressure(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal with an angle @@ -1889,13 +1885,13 @@ int UtcDaliTouchDataGetPressure(void) touchEvent.points[ 0 ].SetPressure( 10.0f ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( PointState::DOWN, data.touchData.points[0].state, TEST_LOCATION ); - DALI_TEST_EQUALS( 10.0f, data.touchData.points[0].pressure, TEST_LOCATION ); + DALI_TEST_EQUALS( PointState::DOWN, data.receivedTouch.points[0].state, TEST_LOCATION ); + DALI_TEST_EQUALS( 10.0f, data.receivedTouch.points[0].pressure, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataUsage(void) +int UtcDaliTouchEventUsage(void) { TestApplication application; @@ -1910,7 +1906,7 @@ int UtcDaliTouchDataUsage(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); @@ -1922,7 +1918,7 @@ int UtcDaliTouchDataUsage(void) END_TEST; } -int UtcDaliTouchDataGetDeviceAPINegative(void) +int UtcDaliTouchEventGetDeviceAPINegative(void) { TestApplication application; @@ -1937,7 +1933,7 @@ int UtcDaliTouchDataGetDeviceAPINegative(void) // Connect to actor's touched signal HandleData handleData; - TouchDataHandleFunctor functor( handleData ); + TouchEventHandleFunctor functor( handleData ); actor.TouchSignal().Connect( &application, functor ); Vector2 screenCoordinates( 10.0f, 10.0f ); @@ -1947,13 +1943,13 @@ int UtcDaliTouchDataGetDeviceAPINegative(void) // Emit a down signal application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, screenCoordinates ) ); - TouchData data = handleData.touchData; + TouchEvent data = handleData.receivedTouchHandle; DALI_TEST_EQUALS( data.GetDeviceClass( -1 ), Device::Class::NONE, TEST_LOCATION ); DALI_TEST_EQUALS( data.GetDeviceSubclass( -1 ), Device::Subclass::NONE, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataGetMouseButtonPositive(void) +int UtcDaliTouchEventGetMouseButtonPositive(void) { TestApplication application; @@ -1968,7 +1964,7 @@ int UtcDaliTouchDataGetMouseButtonPositive(void) // Connect to actor's touched signal HandleData handleData; - TouchDataHandleFunctor functor( handleData ); + TouchEventHandleFunctor functor( handleData ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal with MouseButton @@ -1976,13 +1972,13 @@ int UtcDaliTouchDataGetMouseButtonPositive(void) touchEvent.points[ 0 ].SetMouseButton( static_cast< MouseButton::Type >( 3 ) ); application.ProcessEvent( touchEvent ); - TouchData data = handleData.touchData; + TouchEvent data = handleData.receivedTouchHandle; DALI_TEST_EQUALS( data.GetMouseButton( 0 ), MouseButton::SECONDARY, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataGetMouseButtonNagative(void) +int UtcDaliTouchEventGetMouseButtonNagative(void) { TestApplication application; @@ -1997,7 +1993,7 @@ int UtcDaliTouchDataGetMouseButtonNagative(void) // Connect to actor's touched signal HandleData handleData; - TouchDataHandleFunctor functor( handleData ); + TouchEventHandleFunctor functor( handleData ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal with MouseButton @@ -2005,14 +2001,14 @@ int UtcDaliTouchDataGetMouseButtonNagative(void) touchEvent.points[ 0 ].SetMouseButton( static_cast< MouseButton::Type >( 2 ) ); application.ProcessEvent( touchEvent ); - TouchData data = handleData.touchData; + TouchEvent data = handleData.receivedTouchHandle; DALI_TEST_EQUALS( data.GetMouseButton( 0 ), MouseButton::TERTIARY, TEST_LOCATION ); DALI_TEST_EQUALS( data.GetMouseButton( 3 ), MouseButton::INVALID, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataCapturePropertySet(void) +int UtcDaliTouchEventCapturePropertySet(void) { TestApplication application; @@ -2027,7 +2023,7 @@ int UtcDaliTouchDataCapturePropertySet(void) // Connect to actor's touched signal SignalData data; - TouchDataFunctor functor( data ); + TouchEventFunctor functor( data ); actor.TouchSignal().Connect( &application, functor ); // Emit a down signal @@ -2043,7 +2039,7 @@ int UtcDaliTouchDataCapturePropertySet(void) // Up event, should receive an interrupted application.ProcessEvent( GenerateSingleTouch( PointState::FINISHED, Vector2( 110.0f, 110.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.touchData.GetPoint(0).state, PointState::INTERRUPTED, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouch.GetPoint(0).state, PointState::INTERRUPTED, TEST_LOCATION ); // Now set the capture property actor.SetProperty( DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, true); @@ -2061,21 +2057,21 @@ int UtcDaliTouchDataCapturePropertySet(void) // Up event, we should receive it again, but as ended rather than interrupted application.ProcessEvent( GenerateSingleTouch( PointState::FINISHED, Vector2( 110.0f, 110.0f ) ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.touchData.GetPoint(0).state, PointState::FINISHED, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouch.GetPoint(0).state, PointState::FINISHED, TEST_LOCATION ); END_TEST; } -int UtcDaliTouchDataIntegNewTouchData(void) +int UtcDaliTouchEventIntegNewTouchEvent(void) { uint32_t timestamp = 92858u; TouchPoint tp(1, TouchPoint::State::Started, 34.4f, 123.89f, 5.0f, 7.0f); - Dali::TouchData touchData = Integration::NewTouchData(timestamp, tp); + Dali::TouchEvent touchEvent = Integration::NewTouchEvent(timestamp, tp); - DALI_TEST_EQUALS(touchData.GetPointCount(), 1u, TEST_LOCATION); - DALI_TEST_EQUALS(touchData.GetState(0), PointState::Type::STARTED, TEST_LOCATION ); - DALI_TEST_EQUALS(touchData.GetLocalPosition(0), Vector2(5.0f, 7.0f), TEST_LOCATION ); - DALI_TEST_EQUALS(touchData.GetScreenPosition(0), Vector2(34.4f, 123.89f), TEST_LOCATION ); + DALI_TEST_EQUALS(touchEvent.GetPointCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(touchEvent.GetState(0), PointState::Type::STARTED, TEST_LOCATION ); + DALI_TEST_EQUALS(touchEvent.GetLocalPosition(0), Vector2(5.0f, 7.0f), TEST_LOCATION ); + DALI_TEST_EQUALS(touchEvent.GetScreenPosition(0), Vector2(34.4f, 123.89f), TEST_LOCATION ); END_TEST; diff --git a/dali/devel-api/common/stage.h b/dali/devel-api/common/stage.h index ea99ee1..743f38e 100644 --- a/dali/devel-api/common/stage.h +++ b/dali/devel-api/common/stage.h @@ -40,7 +40,7 @@ class Stage; class Actor; class Layer; class ObjectRegistry; -class TouchData; +class TouchEvent; class RenderTaskList; struct Vector2; struct Vector3; @@ -89,7 +89,7 @@ public: typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type @SINCE_1_0.0 typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type @SINCE_1_0.0 - typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch signal type @SINCE_1_1.37 + typedef Signal< void (const TouchEvent&) > TouchSignalType; ///< Touch signal type @SINCE_1_1.37 typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Wheel signal type @SINCE_1_0.0 typedef Signal< void () > ContextStatusSignal; ///< Context status signal type @SINCE_1_0.0 typedef Signal< void () > SceneCreatedSignalType; ///< Scene created signal type @SINCE_1_0.0 @@ -278,7 +278,7 @@ public: * An interrupted event will also be emitted (if it occurs). * A callback of the following type may be connected: * @code - * void YourCallbackName( TouchData event ); + * void YourCallbackName( TouchEvent event ); * @endcode * * @return The touch signal to connect to diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h index a6098ee..3cfd089 100644 --- a/dali/integration-api/core.h +++ b/dali/integration-api/core.h @@ -51,7 +51,7 @@ class Processor; class RenderController; class Scene; struct Event; -struct TouchData; +struct TouchEvent; /** diff --git a/dali/integration-api/events/touch-data-integ.cpp b/dali/integration-api/events/touch-integ.cpp similarity index 66% rename from dali/integration-api/events/touch-data-integ.cpp rename to dali/integration-api/events/touch-integ.cpp index 572f6db..978e9ed 100644 --- a/dali/integration-api/events/touch-data-integ.cpp +++ b/dali/integration-api/events/touch-integ.cpp @@ -14,19 +14,19 @@ * limitations under the License. */ -#include -#include +#include +#include namespace Dali { namespace Integration { -Dali::TouchData NewTouchData(uint32_t timestamp, const TouchPoint& point) +Dali::TouchEvent NewTouchEvent(uint32_t timestamp, const TouchPoint& point) { - Internal::TouchDataPtr touchDataImpl( new Internal::TouchData(timestamp) ); - touchDataImpl->AddPoint(Integration::Point(point)); - Dali::TouchData handle(touchDataImpl.Get()); + Internal::TouchEventPtr touchEventImpl( new Internal::TouchEvent(timestamp) ); + touchEventImpl->AddPoint(Integration::Point(point)); + Dali::TouchEvent handle(touchEventImpl.Get()); return handle; } diff --git a/dali/integration-api/events/touch-data-integ.h b/dali/integration-api/events/touch-integ.h similarity index 75% rename from dali/integration-api/events/touch-data-integ.h rename to dali/integration-api/events/touch-integ.h index 1478210..4499472 100644 --- a/dali/integration-api/events/touch-data-integ.h +++ b/dali/integration-api/events/touch-integ.h @@ -1,5 +1,5 @@ -#ifndef DALI_INTEGRATION_TOUCH_DATA_INTEG_H -#define DALI_INTEGRATION_TOUCH_DATA_INTEG_H +#ifndef DALI_INTEGRATION_TOUCH_INTEG_H +#define DALI_INTEGRATION_TOUCH_INTEG_H /* * Copyright (c) 2020 Samsung Electronics Co., Ltd. @@ -17,7 +17,9 @@ * limitations under the License. */ -#include +// INTERNAL INCLUDES +#include +#include #include namespace Dali @@ -33,10 +35,10 @@ namespace Integration * @param[in] point The point on screen where the touch occurred. * @return A new touch data handle. */ -DALI_CORE_API Dali::TouchData NewTouchData(uint32_t timestamp, const TouchPoint& point); +DALI_CORE_API Dali::TouchEvent NewTouchEvent(uint32_t timestamp, const TouchPoint& point); } // namespace Integration } // namespace Dali -#endif //DALI_INTEGRATION_TOUCH_DATA_INTEG_H +#endif //DALI_INTEGRATION_TOUCH_INTEG_H diff --git a/dali/integration-api/file.list b/dali/integration-api/file.list index 27597e9..c812931 100644 --- a/dali/integration-api/file.list +++ b/dali/integration-api/file.list @@ -19,9 +19,9 @@ SET( platform_abstraction_src_files ${platform_abstraction_src_dir}/events/wheel-event-integ.cpp ${platform_abstraction_src_dir}/events/multi-point-event-integ.cpp ${platform_abstraction_src_dir}/events/point.cpp - ${platform_abstraction_src_dir}/events/touch-data-integ.cpp - ${platform_abstraction_src_dir}/events/touch-event-combiner.cpp ${platform_abstraction_src_dir}/events/touch-event-integ.cpp + ${platform_abstraction_src_dir}/events/touch-event-combiner.cpp + ${platform_abstraction_src_dir}/events/touch-integ.cpp ) @@ -59,7 +59,7 @@ SET( platform_abstraction_events_header_files ${platform_abstraction_src_dir}/events/point.h ${platform_abstraction_src_dir}/events/touch-event-combiner.h ${platform_abstraction_src_dir}/events/touch-event-integ.h - ${platform_abstraction_src_dir}/events/touch-data-integ.h + ${platform_abstraction_src_dir}/events/touch-integ.h ) diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h index 7d54eb9..f7e5d31 100755 --- a/dali/integration-api/scene.h +++ b/dali/integration-api/scene.h @@ -34,7 +34,7 @@ class Actor; struct KeyEvent; class Layer; class RenderTaskList; -class TouchData; +class TouchEvent; struct WheelEvent; namespace Internal DALI_INTERNAL @@ -59,7 +59,7 @@ public: typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< key event generated signal type - typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type + typedef Signal< void (const Dali::TouchEvent&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type using FrameCallbackContainer = std::vector< std::pair< std::unique_ptr< CallbackBase >, int32_t > >; @@ -328,7 +328,7 @@ public: * An interrupted event will also be emitted (if it occurs). * A callback of the following type may be connected: * @code - * void YourCallbackName( TouchData event ); + * void YourCallbackName( TouchEvent event ); * @endcode * * @return The touch signal to connect to diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h index f72ff69..98cdc61 100644 --- a/dali/internal/common/core-impl.h +++ b/dali/internal/common/core-impl.h @@ -45,7 +45,7 @@ class GlContextHelperAbstraction; class UpdateStatus; class RenderStatus; struct Event; -struct TouchData; +struct TouchEvent; } namespace Internal diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index 38b9ace..ca215aa 100755 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -1822,7 +1822,7 @@ bool Actor::IsGestureRequred( DevelGesture::Type type ) const return mGestureData && mGestureData->IsGestureRequred( type ); } -bool Actor::EmitTouchEventSignal( const Dali::TouchData& touch ) +bool Actor::EmitTouchEventSignal( const Dali::TouchEvent& touch ) { bool consumed = false; @@ -1909,7 +1909,7 @@ void Actor::EmitChildRemovedSignal( Actor& child ) } } -Dali::Actor::TouchDataSignalType& Actor::TouchSignal() +Dali::Actor::TouchEventSignalType& Actor::TouchSignal() { return mTouchSignal; } diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h index a549089..9fd62b3 100644 --- a/dali/internal/event/actors/actor-impl.h +++ b/dali/internal/event/actors/actor-impl.h @@ -44,7 +44,7 @@ namespace Dali struct KeyEvent; class TouchData; -class HoverEvent; +class TouchEvent; struct WheelEvent; namespace Internal @@ -1409,7 +1409,7 @@ public: * @param[in] touch The touch data. * @return True if the event was consumed. */ - bool EmitTouchEventSignal( const Dali::TouchData& touch ); + bool EmitTouchEventSignal( const Dali::TouchEvent& touch ); /** * Used by the EventProcessor to emit hover event signals. @@ -1453,7 +1453,7 @@ public: /** * @copydoc Dali::Actor::TouchEventSignal() */ - Dali::Actor::TouchDataSignalType& TouchSignal(); + Dali::Actor::TouchEventSignalType& TouchSignal(); /** * @copydoc Dali::Actor::HoveredSignal() @@ -1967,7 +1967,7 @@ protected: ActorGestureData* mGestureData; ///< Optional Gesture data. Only created when actor requires gestures // Signals - Dali::Actor::TouchDataSignalType mTouchSignal; + Dali::Actor::TouchEventSignalType mTouchSignal; Dali::Actor::HoverSignalType mHoveredSignal; Dali::Actor::WheelEventSignalType mWheelEventSignal; Dali::Actor::OnSceneSignalType mOnSceneSignal; diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp index 53d60d5..db4c217 100644 --- a/dali/internal/event/common/scene-impl.cpp +++ b/dali/internal/event/common/scene-impl.cpp @@ -315,7 +315,7 @@ void Scene::EmitEventProcessingFinishedSignal() } } -void Scene::EmitTouchedSignal( const Dali::TouchData& touch ) +void Scene::EmitTouchedSignal( const Dali::TouchEvent& touch ) { Dali::Integration::Scene handle( this ); if ( !mTouchSignal.Empty() ) diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h index 9b95c2a..4100f8a 100644 --- a/dali/internal/event/common/scene-impl.h +++ b/dali/internal/event/common/scene-impl.h @@ -207,7 +207,7 @@ public: * Emits the touched signal. * @param[in] touch The touch event details. */ - void EmitTouchedSignal( const Dali::TouchData& touch ); + void EmitTouchedSignal( const Dali::TouchEvent& touch ); /** * Used by the EventProcessor to emit wheel event signals. diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp index f306823..106c58f 100644 --- a/dali/internal/event/common/stage-impl.cpp +++ b/dali/internal/event/common/stage-impl.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -273,7 +273,7 @@ void Stage::OnKeyEvent( const Dali::KeyEvent& event ) } } -void Stage::OnTouchEvent( const Dali::TouchData& touch ) +void Stage::OnTouchEvent( const Dali::TouchEvent& touch ) { mTouchSignal.Emit( touch ); } @@ -302,7 +302,7 @@ void Stage::EmitEventProcessingFinishedSignal() mEventProcessingFinishedSignal.Emit(); } -void Stage::EmitTouchedSignal( const Dali::TouchData& touch ) +void Stage::EmitTouchedSignal( const Dali::TouchEvent& touch ) { mTouchSignal.Emit( touch ); } diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h index a64e964..4ce80b0 100644 --- a/dali/internal/event/common/stage-impl.h +++ b/dali/internal/event/common/stage-impl.h @@ -208,7 +208,7 @@ public: /** * Callback for Internal::Scene TouchSignal signal */ - void OnTouchEvent( const Dali::TouchData& touch ); + void OnTouchEvent( const Dali::TouchEvent& touch ); /** * Callback for Internal::Scene WheelEventSignal signal @@ -239,7 +239,7 @@ public: * Emits the touched signal. * @param[in] touch The touch event details. */ - void EmitTouchedSignal( const Dali::TouchData& touch ); + void EmitTouchedSignal( const Dali::TouchEvent& touch ); /** * Used by the EventProcessor to emit wheel event signals. diff --git a/dali/internal/event/events/touch-data-impl.cpp b/dali/internal/event/events/touch-event-impl.cpp old mode 100755 new mode 100644 similarity index 62% rename from dali/internal/event/events/touch-data-impl.cpp rename to dali/internal/event/events/touch-event-impl.cpp index 481407a..12e21bf --- a/dali/internal/event/events/touch-data-impl.cpp +++ b/dali/internal/event/events/touch-event-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include @@ -27,41 +27,41 @@ namespace Dali namespace Internal { -TouchData::TouchData() +TouchEvent::TouchEvent() : mPoints(), mTime( 0 ) { } -TouchData::TouchData( unsigned long time ) +TouchEvent::TouchEvent( unsigned long time ) : mPoints(), mTime( time ) { } -TouchDataPtr TouchData::Clone( const TouchData& other ) +TouchEventPtr TouchEvent::Clone( const TouchEvent& other ) { - TouchDataPtr touchData( new TouchData ); - touchData->mPoints = other.mPoints; - touchData->mTime = other.mTime; - return touchData; + TouchEventPtr touchEvent( new TouchEvent ); + touchEvent->mPoints = other.mPoints; + touchEvent->mTime = other.mTime; + return touchEvent; } -TouchData::~TouchData() +TouchEvent::~TouchEvent() { } -unsigned long TouchData::GetTime() const +unsigned long TouchEvent::GetTime() const { return mTime; } -std::size_t TouchData::GetPointCount() const +std::size_t TouchEvent::GetPointCount() const { return mPoints.size(); } -int32_t TouchData::GetDeviceId( std::size_t point ) const +int32_t TouchEvent::GetDeviceId( std::size_t point ) const { if( point < mPoints.size() ) { @@ -70,7 +70,7 @@ int32_t TouchData::GetDeviceId( std::size_t point ) const return -1; } -PointState::Type TouchData::GetState( std::size_t point ) const +PointState::Type TouchEvent::GetState( std::size_t point ) const { if( point < mPoints.size() ) { @@ -79,7 +79,7 @@ PointState::Type TouchData::GetState( std::size_t point ) const return PointState::FINISHED; } -Dali::Actor TouchData::GetHitActor( std::size_t point ) const +Dali::Actor TouchEvent::GetHitActor( std::size_t point ) const { if( point < mPoints.size() ) { @@ -88,7 +88,7 @@ Dali::Actor TouchData::GetHitActor( std::size_t point ) const return Dali::Actor(); } -const Vector2& TouchData::GetLocalPosition( std::size_t point ) const +const Vector2& TouchEvent::GetLocalPosition( std::size_t point ) const { if( point < mPoints.size() ) { @@ -97,7 +97,7 @@ const Vector2& TouchData::GetLocalPosition( std::size_t point ) const return Vector2::ZERO; } -const Vector2& TouchData::GetScreenPosition( std::size_t point ) const +const Vector2& TouchEvent::GetScreenPosition( std::size_t point ) const { if( point < mPoints.size() ) { @@ -106,7 +106,7 @@ const Vector2& TouchData::GetScreenPosition( std::size_t point ) const return Vector2::ZERO; } -float TouchData::GetRadius( std::size_t point ) const +float TouchEvent::GetRadius( std::size_t point ) const { if( point < mPoints.size() ) { @@ -115,7 +115,7 @@ float TouchData::GetRadius( std::size_t point ) const return 0.0f; } -const Vector2& TouchData::GetEllipseRadius( std::size_t point ) const +const Vector2& TouchEvent::GetEllipseRadius( std::size_t point ) const { if( point < mPoints.size() ) { @@ -124,7 +124,7 @@ const Vector2& TouchData::GetEllipseRadius( std::size_t point ) const return Vector2::ZERO; } -float TouchData::GetPressure( std::size_t point ) const +float TouchEvent::GetPressure( std::size_t point ) const { if( point < mPoints.size() ) { @@ -133,7 +133,7 @@ float TouchData::GetPressure( std::size_t point ) const return 1.0f; } -Degree TouchData::GetAngle( std::size_t point ) const +Degree TouchEvent::GetAngle( std::size_t point ) const { if( point < mPoints.size() ) { @@ -142,24 +142,24 @@ Degree TouchData::GetAngle( std::size_t point ) const return Degree(); } -const Integration::Point& TouchData::GetPoint( std::size_t point ) const +const Integration::Point& TouchEvent::GetPoint( std::size_t point ) const { DALI_ASSERT_DEBUG( point < mPoints.size() && "No point at index" ); return mPoints[ point ]; } -Integration::Point& TouchData::GetPoint( std::size_t point ) +Integration::Point& TouchEvent::GetPoint( std::size_t point ) { DALI_ASSERT_DEBUG( point < mPoints.size() && "No point at index" ); return mPoints[ point ]; } -void TouchData::AddPoint( const Integration::Point& point ) +void TouchEvent::AddPoint( const Integration::Point& point ) { mPoints.push_back( point ); } -Device::Class::Type TouchData::GetDeviceClass( std::size_t point ) const +Device::Class::Type TouchEvent::GetDeviceClass( std::size_t point ) const { if( point < mPoints.size() ) { @@ -168,7 +168,7 @@ Device::Class::Type TouchData::GetDeviceClass( std::size_t point ) const return Device::Class::NONE; } -Device::Subclass::Type TouchData::GetDeviceSubclass( std::size_t point ) const +Device::Subclass::Type TouchEvent::GetDeviceSubclass( std::size_t point ) const { if( point < mPoints.size() ) { @@ -177,7 +177,7 @@ Device::Subclass::Type TouchData::GetDeviceSubclass( std::size_t point ) const return Device::Subclass::NONE; } -MouseButton::Type TouchData::GetMouseButton( std::size_t point ) const +MouseButton::Type TouchEvent::GetMouseButton( std::size_t point ) const { if( point < mPoints.size() ) { diff --git a/dali/internal/event/events/touch-data-impl.h b/dali/internal/event/events/touch-event-impl.h old mode 100755 new mode 100644 similarity index 69% rename from dali/internal/event/events/touch-data-impl.h rename to dali/internal/event/events/touch-event-impl.h index f016c10..3018763 --- a/dali/internal/event/events/touch-data-impl.h +++ b/dali/internal/event/events/touch-event-impl.h @@ -1,5 +1,5 @@ -#ifndef DALI_INTERNAL_TOUCH_DATA_H -#define DALI_INTERNAL_TOUCH_DATA_H +#ifndef DALI_INTERNAL_TOUCH_EVENT_H +#define DALI_INTERNAL_TOUCH_EVENT_H /* * Copyright (c) 2020 Samsung Electronics Co., Ltd. @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include #include -#include +#include #include #include @@ -34,13 +34,13 @@ struct Vector2; namespace Internal { -class TouchData; -typedef IntrusivePtr< TouchData > TouchDataPtr; +class TouchEvent; +typedef IntrusivePtr< TouchEvent > TouchEventPtr; /** - * @copydoc Dali::TouchData + * @copydoc Dali::TouchEvent */ -class TouchData : public BaseObject +class TouchEvent : public BaseObject { public: @@ -49,82 +49,82 @@ public: /** * @brief Default constructor */ - TouchData(); + TouchEvent(); /** * @brief Constructor * @param[in] time The time the event occurred */ - TouchData( unsigned long time ); + TouchEvent( unsigned long time ); /** - * @brief Clones the TouchData object. + * @brief Clones the TouchEvent object. * * Required because base class copy constructor is not implemented. - * @param[in] other The TouchData to clone from. - * @return A new TouchData object which has the same touch point data. + * @param[in] other The TouchEvent to clone from. + * @return A new TouchEvent object which has the same touch point data. */ - static TouchDataPtr Clone( const TouchData& other ); + static TouchEventPtr Clone( const TouchEvent& other ); /** * @brief Destructor */ - ~TouchData(); + ~TouchEvent(); // Getters /** - * @copydoc Dali::TouchData::GetTime() + * @copydoc Dali::TouchEvent::GetTime() */ unsigned long GetTime() const; /** - * @copydoc Dali::TouchData::GetPointCount() + * @copydoc Dali::TouchEvent::GetPointCount() */ std::size_t GetPointCount() const; /** - * @copydoc Dali::TouchData::GetDeviceId() + * @copydoc Dali::TouchEvent::GetDeviceId() */ int32_t GetDeviceId( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetGetState() + * @copydoc Dali::TouchEvent::GetGetState() */ PointState::Type GetState( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetHitActor() + * @copydoc Dali::TouchEvent::GetHitActor() */ Dali::Actor GetHitActor( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetLocalPosition() + * @copydoc Dali::TouchEvent::GetLocalPosition() */ const Vector2& GetLocalPosition( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetScreenPosition() + * @copydoc Dali::TouchEvent::GetScreenPosition() */ const Vector2& GetScreenPosition( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetRadius() + * @copydoc Dali::TouchEvent::GetRadius() */ float GetRadius( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetEllipseRadius() + * @copydoc Dali::TouchEvent::GetEllipseRadius() */ const Vector2& GetEllipseRadius( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetPressure() + * @copydoc Dali::TouchEvent::GetPressure() */ float GetPressure( std::size_t point ) const; /** - * @copydoc Dali::TouchData::GetAngle() + * @copydoc Dali::TouchEvent::GetAngle() */ Degree GetAngle( std::size_t point ) const; @@ -183,10 +183,10 @@ public: private: /// Undefined Copy constructor - TouchData( const TouchData& other ); + TouchEvent( const TouchEvent& other ); /// Undefined - TouchData& operator=( const TouchData& other ); + TouchEvent& operator=( const TouchEvent& other ); private: @@ -198,24 +198,24 @@ private: // Helpers for public-api forwarding methods -inline Internal::TouchData& GetImplementation( Dali::TouchData& touchData ) +inline Internal::TouchEvent& GetImplementation( Dali::TouchEvent& touchEvent ) { - DALI_ASSERT_ALWAYS( touchData && "Touch Data handle is empty" ); + DALI_ASSERT_ALWAYS( touchEvent && "Touch Event handle is empty" ); - BaseObject& object = touchData.GetBaseObject(); + BaseObject& object = touchEvent.GetBaseObject(); - return static_cast< Internal::TouchData& >( object ); + return static_cast< Internal::TouchEvent& >( object ); } -inline const Internal::TouchData& GetImplementation( const Dali::TouchData& touchData ) +inline const Internal::TouchEvent& GetImplementation( const Dali::TouchEvent& touchEvent ) { - DALI_ASSERT_ALWAYS( touchData && "Touch Data handle is empty" ); + DALI_ASSERT_ALWAYS( touchEvent && "Touch Event handle is empty" ); - const BaseObject& object = touchData.GetBaseObject(); + const BaseObject& object = touchEvent.GetBaseObject(); - return static_cast< const Internal::TouchData& >( object ); + return static_cast< const Internal::TouchEvent& >( object ); } } // namespace Dali -#endif // DALI_INTERNAL_TOUCH_DATA_H +#endif // DALI_INTERNAL_TOUCH_EVENT_H diff --git a/dali/internal/event/events/touch-event-processor.cpp b/dali/internal/event/events/touch-event-processor.cpp index cafdeef..e1c8730 100644 --- a/dali/internal/event/events/touch-event-processor.cpp +++ b/dali/internal/event/events/touch-event-processor.cpp @@ -23,7 +23,7 @@ #endif // INTERNAL INCLUDES -#include +#include #include #include #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -64,7 +64,7 @@ const char * TOUCH_POINT_STATE[ 6 ] = /** * Recursively deliver events to the actor and its parents, until the event is consumed or the stage is reached. */ -Dali::Actor EmitTouchSignals( Dali::Actor actor, const Dali::TouchData& touchData ) +Dali::Actor EmitTouchSignals( Dali::Actor actor, const Dali::TouchEvent& touchEvent ) { Dali::Actor consumedActor; @@ -79,7 +79,7 @@ Dali::Actor EmitTouchSignals( Dali::Actor actor, const Dali::TouchData& touchDat // Only emit the signal if the actor's touch signal has connections (or derived actor implementation requires touch). if ( actorImpl.GetTouchRequired() ) { - consumed = actorImpl.EmitTouchEventSignal( touchData ); + consumed = actorImpl.EmitTouchEventSignal( touchEvent ); } if ( consumed ) @@ -96,7 +96,7 @@ Dali::Actor EmitTouchSignals( Dali::Actor actor, const Dali::TouchData& touchDat (parent == oldParent) ) { // One of the actor's parents may consumed the event and they should be set as the consumed actor. - consumedActor = EmitTouchSignals( parent, touchData ); + consumedActor = EmitTouchSignals( parent, touchEvent ); } } } @@ -106,27 +106,27 @@ Dali::Actor EmitTouchSignals( Dali::Actor actor, const Dali::TouchData& touchDat Dali::Actor AllocAndEmitTouchSignals( unsigned long time, Dali::Actor actor, const Integration::Point& point ) { - TouchDataPtr touchData( new TouchData( time ) ); - Dali::TouchData touchDataHandle( touchData.Get() ); + TouchEventPtr touchEvent( new TouchEvent( time ) ); + Dali::TouchEvent touchEventHandle( touchEvent.Get() ); - touchData->AddPoint( point ); + touchEvent->AddPoint( point ); - return EmitTouchSignals( actor, touchDataHandle ); + return EmitTouchSignals( actor, touchEventHandle ); } /** * Changes the state of the primary point to leave and emits the touch signals */ -Dali::Actor EmitTouchSignals( Actor* actor, RenderTask& renderTask, const TouchDataPtr& originalTouchData, PointState::Type state ) +Dali::Actor EmitTouchSignals( Actor* actor, RenderTask& renderTask, const TouchEventPtr& originalTouchEvent, PointState::Type state ) { Dali::Actor consumingActor; if( actor ) { - TouchDataPtr touchData = TouchData::Clone( *originalTouchData.Get() ); + TouchEventPtr touchEventImpl = TouchEvent::Clone( *originalTouchEvent.Get() ); - Integration::Point& primaryPoint = touchData->GetPoint( 0 ); + Integration::Point& primaryPoint = touchEventImpl->GetPoint( 0 ); const Vector2& screenPosition = primaryPoint.GetScreenPosition(); Vector2 localPosition; @@ -136,7 +136,7 @@ Dali::Actor EmitTouchSignals( Actor* actor, RenderTask& renderTask, const TouchD primaryPoint.SetHitActor( Dali::Actor( actor ) ); primaryPoint.SetState( state ); - consumingActor = EmitTouchSignals( Dali::Actor(actor), Dali::TouchData( touchData.Get() ) ); + consumingActor = EmitTouchSignals( Dali::Actor(actor), Dali::TouchEvent( touchEventImpl.Get() ) ); } return consumingActor; @@ -258,18 +258,18 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even currentPoint.SetHitActor( Dali::Actor() ); - TouchDataPtr touchData( new TouchData( event.time ) ); - Dali::TouchData touchDataHandle( touchData.Get() ); + TouchEventPtr touchEventImpl( new TouchEvent( event.time ) ); + Dali::TouchEvent touchEventHandle( touchEventImpl.Get() ); - touchData->AddPoint( currentPoint ); + touchEventImpl->AddPoint( currentPoint ); - mScene.EmitTouchedSignal( touchDataHandle ); + mScene.EmitTouchedSignal( touchEventHandle ); return false; // No need for hit testing & already an interrupted event so just return false } // 2) Hit Testing. - TouchDataPtr touchData( new TouchData( event.time ) ); - Dali::TouchData touchDataHandle( touchData.Get() ); + TouchEventPtr touchEventImpl( new TouchEvent( event.time ) ); + Dali::TouchEvent touchEventHandle( touchEventImpl.Get() ); DALI_LOG_INFO( gLogFilter, Debug::Concise, "\n" ); DALI_LOG_INFO( gLogFilter, Debug::General, "Point(s): %d\n", event.GetPointCount() ); @@ -297,7 +297,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even newPoint.SetHitActor( hitTestResults.actor ); newPoint.SetLocalPosition( hitTestResults.actorCoordinates ); - touchData->AddPoint( newPoint ); + touchEventImpl->AddPoint( newPoint ); DALI_LOG_INFO( gLogFilter, Debug::General, " State(%s), Screen(%.0f, %.0f), HitActor(%p, %s), Local(%.2f, %.2f)\n", TOUCH_POINT_STATE[currentPoint.GetState()], currentPoint.GetScreenPosition().x, currentPoint.GetScreenPosition().y, @@ -315,11 +315,11 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even Dali::Actor consumedActor; if ( currentRenderTask ) { - consumedActor = EmitTouchSignals( touchData->GetPoint( 0 ).GetHitActor(), touchDataHandle ); + consumedActor = EmitTouchSignals( touchEventImpl->GetPoint( 0 ).GetHitActor(), touchEventHandle ); consumed = consumedActor ? true : false; } - Integration::Point& primaryPoint = touchData->GetPoint( 0 ); + Integration::Point& primaryPoint = touchEventImpl->GetPoint( 0 ); Dali::Actor primaryHitActor = primaryPoint.GetHitActor(); PointState::Type primaryPointState = primaryPoint.GetState(); @@ -327,7 +327,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even DALI_LOG_INFO( gLogFilter, Debug::Concise, "ConsumedActor: (%p) %s\n", consumedActor ? reinterpret_cast< void* >( &consumedActor.GetBaseObject() ) : NULL, consumedActor ? consumedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str() : "" ); if ( ( primaryPointState == PointState::DOWN ) && - ( touchData->GetPointCount() == 1 ) && + ( touchEventImpl->GetPointCount() == 1 ) && ( consumedActor && consumedActor.GetProperty< bool >( Dali::Actor::Property::CONNECTED_TO_SCENE ) ) ) { mTouchDownConsumedActor.SetActor( &GetImplementation( consumedActor ) ); @@ -354,7 +354,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even if ( lastPrimaryHitActor->GetLeaveRequired() ) { DALI_LOG_INFO( gLogFilter, Debug::Concise, "LeaveActor(Hit): (%p) %s\n", reinterpret_cast< void* >( lastPrimaryHitActor ), lastPrimaryHitActor->GetName().c_str() ); - leaveEventConsumer = EmitTouchSignals( mLastPrimaryHitActor.GetActor(), lastRenderTaskImpl, touchData, PointState::LEAVE ); + leaveEventConsumer = EmitTouchSignals( mLastPrimaryHitActor.GetActor(), lastRenderTaskImpl, touchEventImpl, PointState::LEAVE ); } } else @@ -362,7 +362,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even // At this point mLastPrimaryHitActor was touchable and sensitive in the previous touch event process but is not in the current one. // An interrupted event is send to allow some actors to go back to their original state (i.e. Button controls) DALI_LOG_INFO( gLogFilter, Debug::Concise, "InterruptedActor(Hit): (%p) %s\n", reinterpret_cast< void* >( lastPrimaryHitActor ), lastPrimaryHitActor->GetName().c_str() ); - leaveEventConsumer = EmitTouchSignals( mLastPrimaryHitActor.GetActor(), lastRenderTaskImpl, touchData, PointState::INTERRUPTED ); + leaveEventConsumer = EmitTouchSignals( mLastPrimaryHitActor.GetActor(), lastRenderTaskImpl, touchEventImpl, PointState::INTERRUPTED ); } } @@ -382,7 +382,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even if( lastConsumedActor->GetLeaveRequired() ) { DALI_LOG_INFO( gLogFilter, Debug::Concise, "LeaveActor(Consume): (%p) %s\n", reinterpret_cast< void* >( lastConsumedActor ), lastConsumedActor->GetName().c_str() ); - EmitTouchSignals( lastConsumedActor, lastRenderTaskImpl, touchData, PointState::LEAVE ); + EmitTouchSignals( lastConsumedActor, lastRenderTaskImpl, touchEventImpl, PointState::LEAVE ); } } else @@ -390,7 +390,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even // At this point mLastConsumedActor was touchable and sensitive in the previous touch event process but is not in the current one. // An interrupted event is send to allow some actors to go back to their original state (i.e. Button controls) DALI_LOG_INFO( gLogFilter, Debug::Concise, "InterruptedActor(Consume): (%p) %s\n", reinterpret_cast< void* >( lastConsumedActor ), lastConsumedActor->GetName().c_str() ); - EmitTouchSignals( mLastConsumedActor.GetActor(), lastRenderTaskImpl, touchData, PointState::INTERRUPTED ); + EmitTouchSignals( mLastConsumedActor.GetActor(), lastRenderTaskImpl, touchEventImpl, PointState::INTERRUPTED ); } } } @@ -437,7 +437,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even // 6) Emit an interrupted event to the touch-down actor if it hasn't consumed the up and // emit the stage touched event if required. - if ( touchData->GetPointCount() == 1 ) // Only want the first touch and the last release + if ( touchEventImpl->GetPointCount() == 1 ) // Only want the first touch and the last release { switch ( primaryPointState ) { @@ -451,7 +451,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even { Dali::Actor touchDownConsumedActorHandle( touchDownConsumedActor ); - Integration::Point currentPoint = touchData->GetPoint( 0 ); + Integration::Point currentPoint = touchEventImpl->GetPoint( 0 ); currentPoint.SetHitActor( touchDownConsumedActorHandle ); currentPoint.SetState( PointState::INTERRUPTED ); @@ -465,7 +465,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even case PointState::DOWN: { - mScene.EmitTouchedSignal( touchDataHandle ); + mScene.EmitTouchedSignal( touchEventHandle ); break; } @@ -487,21 +487,21 @@ void TouchEventProcessor::OnObservedActorDisconnected( Actor* actor ) { if ( actor == mLastPrimaryHitActor.GetActor() ) { - Dali::Actor handle( actor ); + Dali::Actor actorHandle( actor ); Integration::Point point; point.SetState( PointState::INTERRUPTED ); - point.SetHitActor( handle ); + point.SetHitActor( actorHandle ); - TouchDataPtr touchData( new TouchData ); - touchData->AddPoint( point ); - Dali::TouchData touchDataHandle( touchData.Get() ); + TouchEventPtr touchEventImpl( new TouchEvent ); + touchEventImpl->AddPoint( point ); + Dali::TouchEvent touchEventHandle( touchEventImpl.Get() ); - Dali::Actor eventConsumer = EmitTouchSignals( handle, touchDataHandle ); + Dali::Actor eventConsumer = EmitTouchSignals( actorHandle, touchEventHandle ); if ( mLastConsumedActor.GetActor() != eventConsumer ) { - EmitTouchSignals( Dali::Actor( mLastConsumedActor.GetActor() ), touchDataHandle ); + EmitTouchSignals( Dali::Actor( mLastConsumedActor.GetActor() ), touchEventHandle ); } // Do not set mLastPrimaryHitActor to NULL we may be iterating through its observers diff --git a/dali/internal/file.list b/dali/internal/file.list index 4e4f2ba..b4642ee 100644 --- a/dali/internal/file.list +++ b/dali/internal/file.list @@ -58,7 +58,7 @@ SET( internal_src_files ${internal_src_dir}/event/events/hover-event-processor.cpp ${internal_src_dir}/event/events/wheel-event-processor.cpp ${internal_src_dir}/event/events/multi-point-event-util.cpp - ${internal_src_dir}/event/events/touch-data-impl.cpp + ${internal_src_dir}/event/events/touch-event-impl.cpp ${internal_src_dir}/event/events/touch-event-processor.cpp ${internal_src_dir}/event/events/long-press-gesture/long-press-gesture-detector-impl.cpp ${internal_src_dir}/event/events/long-press-gesture/long-press-gesture-event.cpp diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp index 3c314fc..bdec7c3 100644 --- a/dali/public-api/actors/actor.cpp +++ b/dali/public-api/actors/actor.cpp @@ -202,7 +202,7 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const return GetImplementation(*this).GetRelayoutSize( dimension ); } -Actor::TouchDataSignalType& Actor::TouchSignal() +Actor::TouchEventSignalType& Actor::TouchSignal() { return GetImplementation( *this ).TouchSignal(); } diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index ecf8372..21ead2d 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -49,7 +49,7 @@ class Renderer; struct Degree; class Quaternion; class Layer; -class TouchData; +class TouchEvent; class HoverEvent; struct WheelEvent; struct Vector2; @@ -730,7 +730,7 @@ public: // Typedefs - typedef Signal< bool (Actor, const TouchData&) > TouchDataSignalType; ///< Touch signal type @SINCE_1_1.37 + typedef Signal< bool (Actor, const TouchEvent&) > TouchEventSignalType; ///< Touch signal type @SINCE_1_1.37 typedef Signal< bool (Actor, const HoverEvent&) > HoverSignalType; ///< Hover signal type @SINCE_1_0.0 typedef Signal< bool (Actor, const WheelEvent&) > WheelEventSignalType; ///< Wheel signal type @SINCE_1_0.0 typedef Signal< void (Actor) > OnSceneSignalType; ///< Scene connection signal type @SINCE_1_9.24 @@ -1165,7 +1165,7 @@ public: // Signals * * A callback of the following type may be connected: * @code - * bool YourCallbackName( Actor actor, TouchData& touch ); + * bool YourCallbackName( Actor actor, TouchEvent& touch ); * @endcode * The return value of True, indicates that the touch event has been consumed. * Otherwise the signal will be emitted on the next sensitive parent of the actor. @@ -1174,7 +1174,7 @@ public: // Signals * @return The signal to connect to * @pre The Actor has been initialized. */ - TouchDataSignalType& TouchSignal(); + TouchEventSignalType& TouchSignal(); /** * @brief This signal is emitted when hover input is received. diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h index 86f339f..6627929 100644 --- a/dali/public-api/dali-core.h +++ b/dali/public-api/dali-core.h @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include diff --git a/dali/public-api/events/touch-data.cpp b/dali/public-api/events/touch-event.cpp similarity index 58% rename from dali/public-api/events/touch-data.cpp rename to dali/public-api/events/touch-event.cpp index 54d9a5e..8239d79 100755 --- a/dali/public-api/events/touch-data.cpp +++ b/dali/public-api/events/touch-event.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -16,108 +16,108 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include -#include +#include #include namespace Dali { -TouchData::TouchData() +TouchEvent::TouchEvent() : BaseHandle() { } -TouchData::TouchData( const TouchData& other ) +TouchEvent::TouchEvent( const TouchEvent& other ) : BaseHandle( other ) { } -TouchData::~TouchData() +TouchEvent::~TouchEvent() { } -TouchData& TouchData::operator=( const TouchData& other ) +TouchEvent& TouchEvent::operator=( const TouchEvent& other ) { BaseHandle::operator=( other ); return *this; } -unsigned long TouchData::GetTime() const +unsigned long TouchEvent::GetTime() const { return GetImplementation( *this ).GetTime(); } -std::size_t TouchData::GetPointCount() const +std::size_t TouchEvent::GetPointCount() const { return GetImplementation( *this ).GetPointCount(); } -int32_t TouchData::GetDeviceId( std::size_t point ) const +int32_t TouchEvent::GetDeviceId( std::size_t point ) const { return GetImplementation( *this ).GetDeviceId( point ); } -PointState::Type TouchData::GetState( std::size_t point ) const +PointState::Type TouchEvent::GetState( std::size_t point ) const { return GetImplementation( *this ).GetState( point ); } -Actor TouchData::GetHitActor( std::size_t point ) const +Actor TouchEvent::GetHitActor( std::size_t point ) const { return GetImplementation( *this ).GetHitActor( point ); } -const Vector2& TouchData::GetLocalPosition( std::size_t point ) const +const Vector2& TouchEvent::GetLocalPosition( std::size_t point ) const { return GetImplementation( *this ).GetLocalPosition( point ); } -const Vector2& TouchData::GetScreenPosition( std::size_t point ) const +const Vector2& TouchEvent::GetScreenPosition( std::size_t point ) const { return GetImplementation( *this ).GetScreenPosition( point ); } -float TouchData::GetRadius( std::size_t point ) const +float TouchEvent::GetRadius( std::size_t point ) const { return GetImplementation( *this ).GetRadius( point ); } -const Vector2& TouchData::GetEllipseRadius( std::size_t point ) const +const Vector2& TouchEvent::GetEllipseRadius( std::size_t point ) const { return GetImplementation( *this ).GetEllipseRadius( point ); } -float TouchData::GetPressure( std::size_t point ) const +float TouchEvent::GetPressure( std::size_t point ) const { return GetImplementation( *this ).GetPressure( point ); } -Degree TouchData::GetAngle( std::size_t point ) const +Degree TouchEvent::GetAngle( std::size_t point ) const { return GetImplementation( *this ).GetAngle( point ); } -Device::Class::Type TouchData::GetDeviceClass( std::size_t point ) const +Device::Class::Type TouchEvent::GetDeviceClass( std::size_t point ) const { return GetImplementation( *this ).GetDeviceClass( point ); } -Device::Subclass::Type TouchData::GetDeviceSubclass( std::size_t point ) const +Device::Subclass::Type TouchEvent::GetDeviceSubclass( std::size_t point ) const { return GetImplementation( *this ).GetDeviceSubclass( point ); } -MouseButton::Type TouchData::GetMouseButton( std::size_t point ) const +MouseButton::Type TouchEvent::GetMouseButton( std::size_t point ) const { return GetImplementation( *this ).GetMouseButton( point ); } -TouchData::TouchData( Internal::TouchData* internal ) +TouchEvent::TouchEvent( Internal::TouchEvent* internal ) : BaseHandle( internal ) { } diff --git a/dali/public-api/events/touch-data.h b/dali/public-api/events/touch-event.h old mode 100755 new mode 100644 similarity index 84% rename from dali/public-api/events/touch-data.h rename to dali/public-api/events/touch-event.h index a6e0239..64ae48f --- a/dali/public-api/events/touch-data.h +++ b/dali/public-api/events/touch-event.h @@ -1,8 +1,8 @@ -#ifndef DALI_TOUCH_DATA_H -#define DALI_TOUCH_DATA_H +#ifndef DALI_TOUCH_EVENT_H +#define DALI_TOUCH_EVENT_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -34,7 +34,7 @@ namespace Dali namespace Internal DALI_INTERNAL { -class TouchData; +class TouchEvent; } /** @@ -52,67 +52,67 @@ struct Vector2; * touched or the points where a touch has stopped. * * The first point is the primary point that's used for hit-testing. - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @note As this is a handle to an internal object, it should not be copied (or used in a container) as all that will do is copy the handle to the same object. * The internal object can change which may not be what an application writer expects. * If data does need to be stored in the application, then only the required data should be saved (retrieved using the methods of this class). * - * Should not use this in a TouchData container as it is just a handle and the internal object can change. + * Should not use this in a TouchEvent container as it is just a handle and the internal object can change. */ -class DALI_CORE_API TouchData : public BaseHandle +class DALI_CORE_API TouchEvent : public BaseHandle { public: // Construction & Destruction /** - * @brief An uninitialized TouchData instance. + * @brief An uninitialized TouchEvent instance. * - * Calling member functions with an uninitialized TouchData handle is not allowed. - * @SINCE_1_1.37 + * Calling member functions with an uninitialized TouchEvent handle is not allowed. + * @SINCE_1_9.26 */ - TouchData(); + TouchEvent(); /** * @brief Copy constructor. * - * @SINCE_1_1.37 - * @param[in] other The TouchData to copy from + * @SINCE_1_9.26 + * @param[in] other The TouchEvent to copy from */ - TouchData( const TouchData& other ); + TouchEvent( const TouchEvent& other ); /** * @brief Destructor. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 */ - ~TouchData(); + ~TouchEvent(); // Operators /** * @brief Assignment Operator. * - * @SINCE_1_1.37 - * @param[in] other The TouchData to copy from + * @SINCE_1_9.26 + * @param[in] other The TouchEvent to copy from * @return A reference to this */ - TouchData& operator=( const TouchData& other ); + TouchEvent& operator=( const TouchEvent& other ); // Getters /** * @brief Returns the time (in ms) that the touch event occurred. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @return The time (in ms) that the touch event occurred */ unsigned long GetTime() const; /** - * @brief Returns the total number of points in this TouchData. + * @brief Returns the total number of points in this TouchEvent. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @return Total number of Points */ std::size_t GetPointCount() const; @@ -123,7 +123,7 @@ public: * Each point has a unique device ID which specifies the device used for that * point. This is returned by this method. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @param[in] point The point required * @return The Device ID of this point * @note If point is greater than GetPointCount() then this method will return -1. @@ -133,7 +133,7 @@ public: /** * @brief Retrieves the State of the point specified. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @param[in] point The point required * @return The state of the point specified * @note If point is greater than GetPointCount() then this method will return PointState::FINISHED. @@ -144,7 +144,7 @@ public: /** * @brief Retrieves the actor that was underneath the point specified. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @param[in] point The point required * @return The actor that was underneath the point specified * @note If point is greater than GetPointCount() then this method will return an empty handle. @@ -154,7 +154,7 @@ public: /** * @brief Retrieves the co-ordinates relative to the top-left of the hit-actor at the point specified. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @param[in] point The point required * @return The co-ordinates relative to the top-left of the hit-actor of the point specified * @@ -168,7 +168,7 @@ public: /** * @brief Retrieves the co-ordinates relative to the top-left of the screen of the point specified. * - * @SINCE_1_1.37 + * @SINCE_1_9.26 * @param[in] point The point required * @return The co-ordinates relative to the top-left of the screen of the point specified * @note If point is greater than GetPointCount() then this method will return Vector2::ZERO. @@ -180,7 +180,7 @@ public: * * This is the average of both the horizontal and vertical radii of the press point. * - * @SINCE_1_1.39 + * @SINCE_1_9.26 * @param[in] point The point required * @return The radius of the press point * @note If point is greater than GetPointCount() then this method will return 0.0f. @@ -190,7 +190,7 @@ public: /** * @brief Retrieves BOTH the horizontal and the vertical radii of the press point. * - * @SINCE_1_1.39 + * @SINCE_1_9.26 * @param[in] point The point required * @return The horizontal and vertical radii of the press point * @note If point is greater than GetPointCount() then this method will return Vector2::ZERO. @@ -205,7 +205,7 @@ public: * A value between 0.0f and 1.0f means light pressure has been applied. * A value greater than 1.0f means more pressure than normal has been applied. * - * @SINCE_1_1.39 + * @SINCE_1_9.26 * @param[in] point The point required * @return The touch pressure * @note If point is greater than GetPointCount() then this method will return 1.0f. @@ -215,7 +215,7 @@ public: /** * @brief Retrieves the angle of the press point relative to the Y-Axis. * - * @SINCE_1_1.39 + * @SINCE_1_9.26 * @param[in] point The point required * @return The angle of the press point * @note If point is greater than GetPointCount() then this method will return Degree(). @@ -226,7 +226,7 @@ public: * @brief Gets the device class type from which the mouse/touch event is originated. * * The device class type is classification type of the input device of event received. - * @SINCE_1_2.60 + * @SINCE_1_9.26 * @param[in] point The point required * @return The type of the device class */ @@ -236,7 +236,7 @@ public: * @brief Gets the subclass type of the device from which the mouse/touch event is originated. * * The device subclass type is subclassification type of the input device of event received. - * @SINCE_1_2.60 + * @SINCE_1_9.26 * @param[in] point The point required * @return The type of the device subclass */ @@ -246,7 +246,7 @@ public: /** * @brief Gets the value, which indicates a mouse button. (ex: right/left button) * - * @SINCE_1_3_31 + * @SINCE_1_9.26 * @param[in] point The point required * @return The mouse button value */ @@ -257,12 +257,12 @@ public: // Not intended for application developers /// @cond internal /** - * @brief This constructor is used internally to Create an initialized TouchData handle. + * @brief This constructor is used internally to Create an initialized TouchEvent handle. * - * @SINCE_1_1.37 - * @param[in] touchData A pointer to a newly allocated Dali resource + * @SINCE_1_9.26 + * @param[in] internal A pointer to a newly allocated Dali resource */ - explicit DALI_INTERNAL TouchData( Internal::TouchData* touchData ); + explicit DALI_INTERNAL TouchEvent( Internal::TouchEvent* internal ); /// @endcond }; @@ -271,4 +271,4 @@ public: // Not intended for application developers */ } // namespace Dali -#endif // DALI_TOUCH_DATA_H +#endif // DALI_TOUCH_EVENT_H diff --git a/dali/public-api/file.list b/dali/public-api/file.list index e4d7486..a9c0577 100644 --- a/dali/public-api/file.list +++ b/dali/public-api/file.list @@ -34,7 +34,7 @@ SET( public_api_src_files ${public_api_src_dir}/events/tap-gesture.cpp ${public_api_src_dir}/events/tap-gesture-detector.cpp ${public_api_src_dir}/events/touch-point.cpp - ${public_api_src_dir}/events/touch-data.cpp + ${public_api_src_dir}/events/touch-event.cpp ${public_api_src_dir}/images/pixel.cpp ${public_api_src_dir}/images/pixel-data.cpp ${public_api_src_dir}/math/compile-time-math.cpp @@ -144,7 +144,7 @@ SET( public_api_core_events_header_files ${public_api_src_dir}/events/tap-gesture.h ${public_api_src_dir}/events/tap-gesture-detector.h ${public_api_src_dir}/events/touch-point.h - ${public_api_src_dir}/events/touch-data.h + ${public_api_src_dir}/events/touch-event.h ${public_api_src_dir}/events/mouse-button.h ) diff --git a/dali/public-api/signals/dali-signal.h b/dali/public-api/signals/dali-signal.h index b31b1b6..ec789c4 100644 --- a/dali/public-api/signals/dali-signal.h +++ b/dali/public-api/signals/dali-signal.h @@ -31,7 +31,7 @@ * class MyClass : public ConnectionTracker * { * - * void Callback( Actor actor, const TouchData& event ) + * void Callback( Actor actor, const TouchEvent& event ) * { * ... * } -- 2.7.4