From 0950304e0f940a0587bc7bc2fe76e176ffdc77c6 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 24 Aug 2020 14:54:54 +0900 Subject: [PATCH] Revert "Revert "Changes after TouchData renamed to TouchEvent"" This reverts commit 4f5496d3c0f3a7cb54607156b0ed0335da983104. --- examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp | 6 +++--- .../animated-gradient-card-active/animated-gradient-card-active.cpp | 4 ++-- examples/arc-visual/arc-visual-example.cpp | 4 ++-- examples/benchmark/benchmark.cpp | 2 +- examples/bezier-curve/bezier-curve-example.cpp | 4 ++-- examples/blocks/blocks-example.cpp | 4 ++-- examples/bubble-effect/bubble-effect-example.cpp | 2 +- examples/clipping-draw-order/clipping-draw-order.cpp | 2 +- examples/color-visual/color-visual-example.cpp | 2 +- .../compressed-texture-formats-example.cpp | 2 +- examples/fpp-game/fpp-game-tutorial-controller.cpp | 4 ++-- examples/fpp-game/fpp-game-tutorial-controller.h | 2 +- examples/fpp-game/game-camera.cpp | 4 ++-- examples/fpp-game/game-camera.h | 2 +- examples/gaussian-blur-view/gaussian-blur-view-example.cpp | 2 +- examples/gestures/gesture-example.cpp | 2 +- examples/hello-world/hello-world-example.cpp | 2 +- examples/homescreen-benchmark/homescreen-benchmark.cpp | 2 +- .../image-scaling-and-filtering-example.cpp | 2 +- .../image-scaling-irregular-grid-example.cpp | 2 +- examples/magnifier/magnifier-example.cpp | 2 +- examples/mesh-visual/mesh-visual-example.cpp | 2 +- examples/metaball-explosion/metaball-explosion-example.cpp | 4 ++-- examples/metaball-refrac/metaball-refrac-example.cpp | 4 ++-- examples/perf-scroll/perf-scroll.cpp | 2 +- examples/ray-marching/ray-marching-example.cpp | 2 +- examples/refraction-effect/refraction-effect-example.cpp | 2 +- examples/remote-image-loading/remote-image-loading-example.cpp | 4 ++-- examples/renderer-stencil/renderer-stencil-example.cpp | 2 +- examples/rendering-basic-light/rendering-basic-light-example.cpp | 2 +- examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp | 2 +- examples/rendering-cube/rendering-cube.cpp | 2 +- examples/rendering-line/rendering-line.cpp | 2 +- examples/rendering-radial-progress/radial-progress.cpp | 2 +- examples/rendering-skybox/look-camera.cpp | 4 ++-- examples/rendering-skybox/look-camera.h | 2 +- examples/rendering-textured-cube/rendering-textured-cube.cpp | 2 +- examples/rendering-triangle/rendering-triangle.cpp | 2 +- examples/scroll-view/scroll-view-example.cpp | 2 +- examples/text-field/text-field-example.cpp | 2 +- examples/text-label-emojis/text-label-emojis.cpp | 2 +- .../text-label-multi-language/text-label-multi-language-example.cpp | 2 +- examples/tilt/tilt-example.cpp | 2 +- examples/visual-transitions/transition-application.cpp | 4 ++-- examples/visual-transitions/transition-application.h | 4 ++-- examples/web-view/web-view-example.cpp | 2 +- shared/dali-table-view.cpp | 4 ++-- shared/dali-table-view.h | 6 +++--- 48 files changed, 65 insertions(+), 65 deletions(-) diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp index 4a80e59..6ed10ed 100644 --- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp +++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp @@ -83,15 +83,15 @@ private: window.TouchSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched ); } - void OnTouched( const TouchData& touchData ) + void OnTouched( const TouchEvent& touch ) { static bool touched = false; - if( touchData.GetState( 0 ) == PointState::DOWN ) + if( touch.GetState( 0 ) == PointState::DOWN ) { touched = true; } - if( touchData.GetState( 0 ) == PointState::UP && touched) + if( touch.GetState( 0 ) == PointState::UP && touched ) { mImageCombinationIndex++; touched = false; diff --git a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp index 7ec7d9f..9861aa4 100644 --- a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp +++ b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp @@ -312,7 +312,7 @@ public: Reset(); } - bool OnTouchCards(Actor actor, const TouchData &data) + bool OnTouchCards(Actor actor, const TouchEvent &data) { if( data.GetPointCount() > 0 ) { @@ -347,7 +347,7 @@ public: return true; } - bool OnTouchLayer(Actor actor, const TouchData &data) + bool OnTouchLayer(Actor actor, const TouchEvent &data) { if( data.GetPointCount() > 0 ) { diff --git a/examples/arc-visual/arc-visual-example.cpp b/examples/arc-visual/arc-visual-example.cpp index 3131981..88e4253 100644 --- a/examples/arc-visual/arc-visual-example.cpp +++ b/examples/arc-visual/arc-visual-example.cpp @@ -171,7 +171,7 @@ private: window.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent ); } - bool OnButtonTouch( Actor actor, const TouchData& touch ) + bool OnButtonTouch( Actor actor, const TouchEvent& touch ) { if( touch.GetState( 0 ) == PointState::UP ) { @@ -212,7 +212,7 @@ private: return true; } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { if( touch.GetState( 0 ) == PointState::UP ) { diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index e8755a5..7a12692 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -256,7 +256,7 @@ public: ShowAnimation(); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp index 38405af..677152e 100644 --- a/examples/bezier-curve/bezier-curve-example.cpp +++ b/examples/bezier-curve/bezier-curve-example.cpp @@ -492,7 +492,7 @@ public: } } - bool OnTouchControlPoint( Actor controlPoint, const TouchData& event ) + bool OnTouchControlPoint( Actor controlPoint, const TouchEvent& event ) { if( event.GetPointCount() > 0 ) { @@ -510,7 +510,7 @@ public: return false; // Don't mark this as consumed - let the layer get the touch } - bool OnTouchLayer( Actor actor, const TouchData& event ) + bool OnTouchLayer( Actor actor, const TouchEvent& event ) { if( event.GetPointCount() > 0 ) { diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index 66c9916..300f057 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -615,7 +615,7 @@ private: * @param[in] actor The actor touched * @param[in] event The touch event */ - bool OnTouchPaddle(Actor actor, const TouchData& event) + bool OnTouchPaddle(Actor actor, const TouchEvent& event) { if(event.GetPointCount()>0) { @@ -641,7 +641,7 @@ private: * @param[in] actor The actor touched * @param[in] event The touch event */ - bool OnTouchLayer(Actor actor, const TouchData& event) + bool OnTouchLayer(Actor actor, const TouchEvent& event) { if(event.GetPointCount()>0) { diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp index ad6b774..58c7888 100644 --- a/examples/bubble-effect/bubble-effect-example.cpp +++ b/examples/bubble-effect/bubble-effect-example.cpp @@ -202,7 +202,7 @@ private: } // Callback function of the touch signal on the background - bool OnTouch(Dali::Actor actor, const Dali::TouchData& event) + bool OnTouch(Dali::Actor actor, const Dali::TouchEvent& event) { switch( event.GetState( 0 ) ) { diff --git a/examples/clipping-draw-order/clipping-draw-order.cpp b/examples/clipping-draw-order/clipping-draw-order.cpp index c8a5775..363ef09 100644 --- a/examples/clipping-draw-order/clipping-draw-order.cpp +++ b/examples/clipping-draw-order/clipping-draw-order.cpp @@ -201,7 +201,7 @@ public: window.GetRootLayer().TouchSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // Quit the application. mApplication.Quit(); diff --git a/examples/color-visual/color-visual-example.cpp b/examples/color-visual/color-visual-example.cpp index d96e586..27c85d2 100644 --- a/examples/color-visual/color-visual-example.cpp +++ b/examples/color-visual/color-visual-example.cpp @@ -86,7 +86,7 @@ public: window.KeyEventSignal().Connect( this, &ColorVisualExample::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { if( touch.GetState( 0 ) == PointState::UP ) { diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp index ec957ce..912d6f4 100644 --- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp +++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp @@ -181,7 +181,7 @@ public: window.KeyEventSignal().Connect(this, &CompressedTextureFormatsController::OnKeyEvent); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/fpp-game/fpp-game-tutorial-controller.cpp b/examples/fpp-game/fpp-game-tutorial-controller.cpp index ef20090..7ee29f1 100644 --- a/examples/fpp-game/fpp-game-tutorial-controller.cpp +++ b/examples/fpp-game/fpp-game-tutorial-controller.cpp @@ -17,7 +17,7 @@ #include "fpp-game-tutorial-controller.h" -#include +#include #include #include #include @@ -40,7 +40,7 @@ FppGameTutorialController::~FppGameTutorialController() } -void FppGameTutorialController::OnTouch( const TouchData& touchEvent ) +void FppGameTutorialController::OnTouch( const TouchEvent& touchEvent ) { Vector2 size( mWindow.GetSize() ); diff --git a/examples/fpp-game/fpp-game-tutorial-controller.h b/examples/fpp-game/fpp-game-tutorial-controller.h index cafdeb6..cc09dae 100644 --- a/examples/fpp-game/fpp-game-tutorial-controller.h +++ b/examples/fpp-game/fpp-game-tutorial-controller.h @@ -48,7 +48,7 @@ public: * Handles tutorial touch input * @param[in] touchEvent Incoming touch event in the UI space */ - void OnTouch( const Dali::TouchData& touchEvent ); + void OnTouch( const Dali::TouchEvent& touchEvent ); /** * Handles tutorial animation finished signal diff --git a/examples/fpp-game/game-camera.cpp b/examples/fpp-game/game-camera.cpp index 975dafa..2d33dc6 100644 --- a/examples/fpp-game/game-camera.cpp +++ b/examples/fpp-game/game-camera.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include using namespace Dali; @@ -204,7 +204,7 @@ void GameCamera::CreateInterceptorActor() mInterceptorActor.TouchSignal().Connect( this, &GameCamera::OnTouch ); } -bool GameCamera::OnTouch( Actor actor, const TouchData& touch ) +bool GameCamera::OnTouch( Actor actor, const TouchEvent& touch ) { for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i ) { diff --git a/examples/fpp-game/game-camera.h b/examples/fpp-game/game-camera.h index edbfdc8..879af85 100644 --- a/examples/fpp-game/game-camera.h +++ b/examples/fpp-game/game-camera.h @@ -81,7 +81,7 @@ private: * @param[in] actor Actor receiving signal * @param[in] touch Touch data */ - bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch ); + bool OnTouch( Dali::Actor actor, const Dali::TouchEvent& touch ); /** * Handles camera tick() update diff --git a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp index b3651d0..d93703d 100644 --- a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp +++ b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp @@ -113,7 +113,7 @@ private: window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { const PointState::Type state = touch.GetState( 0 ); diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp index c76496b..0bbeba1 100644 --- a/examples/gestures/gesture-example.cpp +++ b/examples/gestures/gesture-example.cpp @@ -221,7 +221,7 @@ private: * @param[in] actor The touched actor * @param[in] touch The touch event */ - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { switch( touch.GetState( 0 ) ) { diff --git a/examples/hello-world/hello-world-example.cpp b/examples/hello-world/hello-world-example.cpp index 22a13ab..8e19077 100644 --- a/examples/hello-world/hello-world-example.cpp +++ b/examples/hello-world/hello-world-example.cpp @@ -54,7 +54,7 @@ public: window.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp index e47e5be..cde8ee0 100644 --- a/examples/homescreen-benchmark/homescreen-benchmark.cpp +++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp @@ -190,7 +190,7 @@ public: window.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // Quit the application. mApplication.Quit(); diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index c6f842e..ea8290f 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -495,7 +495,7 @@ public: } } - bool OnControlTouched( Actor actor, const TouchData& event ) + bool OnControlTouched( Actor actor, const TouchEvent& event ) { if(event.GetPointCount() > 0) { diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index cd6c837..567c569 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -502,7 +502,7 @@ public: * @param[in] actor The actor touched * @param[in] event The Touch information. */ - bool OnTouchImage( Actor actor, const TouchData& event ) + bool OnTouchImage( Actor actor, const TouchEvent& event ) { if( ( event.GetPointCount() > 0 ) && ( !mScrolling ) ) { diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index e1d7b6b..305485a 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -298,7 +298,7 @@ public: * @param[in] actor The actor that received the touch * @param[in] event The touch-event information */ - bool OnTouched( Actor actor, const TouchData& event ) + bool OnTouched( Actor actor, const TouchEvent& event ) { if(event.GetPointCount() > 0) { diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp index 02fef7e..9697649 100644 --- a/examples/mesh-visual/mesh-visual-example.cpp +++ b/examples/mesh-visual/mesh-visual-example.cpp @@ -395,7 +395,7 @@ public: //If the light source is touched, move it by dragging it. //If a model is touched, rotate it by panning around. - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { switch( touch.GetState( 0 ) ) { diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 5601a00..0eae70b 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.cpp @@ -204,7 +204,7 @@ public: * Touch event handler to center metaballs at touch position * and start explosion animation on release */ - bool OnTouch( Actor actor, const TouchData& touch ); + bool OnTouch( Actor actor, const TouchEvent& touch ); /** * Key event handler to quit application on escape or back key @@ -629,7 +629,7 @@ void MetaballExplosionController::SetPositionToMetaballs( const Vector2& metabal mCompositionActor.SetProperty( mPositionIndex, metaballCenter ); } -bool MetaballExplosionController::OnTouch( Actor actor, const TouchData& touch ) +bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent& touch ) { float aspectR = mScreenSize.y / mScreenSize.x; diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index 2184a7a..e66ecde 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -196,7 +196,7 @@ public: /** * Touch handler, start the grow animation and creates additional metaballs */ - bool OnTouch( Actor actor, const TouchData& touch ); + bool OnTouch( Actor actor, const TouchEvent& touch ); /** * Key event callback to quit the application on escape or back key @@ -680,7 +680,7 @@ void MetaballRefracController::SetPositionToMetaballs( const Vector2& metaballCe } } -bool MetaballRefracController::OnTouch( Actor actor, const TouchData& touch ) +bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent& touch ) { const float aspect = mScreenSize.y / mScreenSize.x; switch( touch.GetState( 0 ) ) diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index be98e66..35dca01 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -261,7 +261,7 @@ public: ShowAnimation(); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/ray-marching/ray-marching-example.cpp b/examples/ray-marching/ray-marching-example.cpp index 7ea5486..0660bec 100644 --- a/examples/ray-marching/ray-marching-example.cpp +++ b/examples/ray-marching/ray-marching-example.cpp @@ -137,7 +137,7 @@ public: AddContentLayer(); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index e995e60..804e784 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -352,7 +352,7 @@ private: return true; } - bool OnTouch( Actor actor, const TouchData& event ) + bool OnTouch( Actor actor, const TouchEvent& event ) { switch( event.GetState( 0 ) ) { diff --git a/examples/remote-image-loading/remote-image-loading-example.cpp b/examples/remote-image-loading/remote-image-loading-example.cpp index 5bf7e1f..a58abf4 100644 --- a/examples/remote-image-loading/remote-image-loading-example.cpp +++ b/examples/remote-image-loading/remote-image-loading-example.cpp @@ -144,7 +144,7 @@ public: } } - void OnTouch(const TouchData &touch) + void OnTouch(const TouchEvent &touch) { if (touch.GetState(0) == PointState::DOWN) { @@ -165,7 +165,7 @@ public: return false; } - bool OnControlTouch(Actor actor, const TouchData &touch) + bool OnControlTouch(Actor actor, const TouchEvent &touch) { if (touch.GetState(0) == PointState::DOWN) { diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp index 9868596..e9004db 100644 --- a/examples/renderer-stencil/renderer-stencil-example.cpp +++ b/examples/renderer-stencil/renderer-stencil-example.cpp @@ -718,7 +718,7 @@ private: * @param[in] touch The touch information * @return True if the event has been handled */ - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // Quit the application. mApplication.Quit(); diff --git a/examples/rendering-basic-light/rendering-basic-light-example.cpp b/examples/rendering-basic-light/rendering-basic-light-example.cpp index f9b960b..7d89a77 100644 --- a/examples/rendering-basic-light/rendering-basic-light-example.cpp +++ b/examples/rendering-basic-light/rendering-basic-light-example.cpp @@ -203,7 +203,7 @@ public: /** * This function will change the material of the cube when touched */ - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { if(touch.GetState(0) == PointState::UP) { diff --git a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp index c333bc3..7d15eab 100644 --- a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp +++ b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp @@ -145,7 +145,7 @@ public: /** * This function will change the material Roughness, Metalness or the model orientation when touched */ - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { const PointState::Type state = touch.GetState( 0 ); diff --git a/examples/rendering-cube/rendering-cube.cpp b/examples/rendering-cube/rendering-cube.cpp index e7059ff..9b4260f 100644 --- a/examples/rendering-cube/rendering-cube.cpp +++ b/examples/rendering-cube/rendering-cube.cpp @@ -105,7 +105,7 @@ public: window.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/rendering-line/rendering-line.cpp b/examples/rendering-line/rendering-line.cpp index 2d6dbe3..1f421ad 100644 --- a/examples/rendering-line/rendering-line.cpp +++ b/examples/rendering-line/rendering-line.cpp @@ -98,7 +98,7 @@ public: window.KeyEventSignal().Connect( this, &DrawLineController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/rendering-radial-progress/radial-progress.cpp b/examples/rendering-radial-progress/radial-progress.cpp index 2c7008b..e3133ca 100644 --- a/examples/rendering-radial-progress/radial-progress.cpp +++ b/examples/rendering-radial-progress/radial-progress.cpp @@ -155,7 +155,7 @@ public: window.GetRootLayer().TouchSignal().Connect( this, &RadialProgressController::OnTouch ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/rendering-skybox/look-camera.cpp b/examples/rendering-skybox/look-camera.cpp index 1ef3194..54f0c8a 100644 --- a/examples/rendering-skybox/look-camera.cpp +++ b/examples/rendering-skybox/look-camera.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include using namespace Dali; @@ -147,7 +147,7 @@ void LookCamera::CreateInterceptorActor() mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch ); } -bool LookCamera::OnTouch( Actor actor, const TouchData& touch ) +bool LookCamera::OnTouch( Actor actor, const TouchEvent& touch ) { for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i ) { diff --git a/examples/rendering-skybox/look-camera.h b/examples/rendering-skybox/look-camera.h index 4a0dc92..4ab6fee 100644 --- a/examples/rendering-skybox/look-camera.h +++ b/examples/rendering-skybox/look-camera.h @@ -77,7 +77,7 @@ private: * @param[in] actor Actor receiving signal * @param[in] touch Touch data */ - bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch ); + bool OnTouch( Dali::Actor actor, const Dali::TouchEvent& touch ); /** * Handles camera tick() update diff --git a/examples/rendering-textured-cube/rendering-textured-cube.cpp b/examples/rendering-textured-cube/rendering-textured-cube.cpp index cc20719..be22567 100644 --- a/examples/rendering-textured-cube/rendering-textured-cube.cpp +++ b/examples/rendering-textured-cube/rendering-textured-cube.cpp @@ -111,7 +111,7 @@ public: window.KeyEventSignal().Connect( this, &TexturedCubeController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/rendering-triangle/rendering-triangle.cpp b/examples/rendering-triangle/rendering-triangle.cpp index 58fedcb..c69f323 100644 --- a/examples/rendering-triangle/rendering-triangle.cpp +++ b/examples/rendering-triangle/rendering-triangle.cpp @@ -98,7 +98,7 @@ public: window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index ab7789a..e9c65d0 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -499,7 +499,7 @@ private: * @param[in] actor The actor touched * @param[in] event The touch information. */ - bool OnTouchImage( Actor actor, const TouchData& event ) + bool OnTouchImage( Actor actor, const TouchEvent& event ) { if( (event.GetPointCount() > 0) && (!mScrolling) ) { diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index b2478b3..8e9614e 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -151,7 +151,7 @@ public: mField.Reset(); } - bool OnPopupTouched( Actor actor, const TouchData& event ) + bool OnPopupTouched( Actor actor, const TouchEvent& event ) { // End edit mode for TextField if parent Popup touched. if(event.GetPointCount() > 0) diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp index 3c96974..6068e61 100644 --- a/examples/text-label-emojis/text-label-emojis.cpp +++ b/examples/text-label-emojis/text-label-emojis.cpp @@ -83,7 +83,7 @@ public: } } - bool OnTouch( Actor actor, const TouchData& event ) + bool OnTouch( Actor actor, const TouchEvent& event ) { if( 1u == event.GetPointCount() ) { diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp index d55d2a7..a1a9b8e 100644 --- a/examples/text-label-multi-language/text-label-multi-language-example.cpp +++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp @@ -85,7 +85,7 @@ public: } } - bool OnTouch( Actor actor, const TouchData& event ) + bool OnTouch( Actor actor, const TouchEvent& event ) { if( 1u == event.GetPointCount() ) { diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp index 06bf64e..aaee512 100644 --- a/examples/tilt/tilt-example.cpp +++ b/examples/tilt/tilt-example.cpp @@ -74,7 +74,7 @@ public: } } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp index b721341..70b330d 100644 --- a/examples/visual-transitions/transition-application.cpp +++ b/examples/visual-transitions/transition-application.cpp @@ -276,9 +276,9 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) } } -bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData& touchData ) +bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchEvent& touch ) { - if( touchData.GetState(0) == PointState::FINISHED ) + if( touch.GetState(0) == PointState::FINISHED ) { int visual = actor.GetProperty( mVisualIndex ); Property::Map map; diff --git a/examples/visual-transitions/transition-application.h b/examples/visual-transitions/transition-application.h index 9846c11..6f6e722 100644 --- a/examples/visual-transitions/transition-application.h +++ b/examples/visual-transitions/transition-application.h @@ -2,7 +2,7 @@ #define DALI_DEMO_TRANSITION_APPLICATION_H /* - * Copyright (c) 2016 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. @@ -57,7 +57,7 @@ public: void OnKeyEvent( const KeyEvent& event ); bool OnActionButtonClicked( Button button ); - bool OnVisualButtonClicked( Actor actor, const TouchData& touchData ); + bool OnVisualButtonClicked( Actor actor, const TouchEvent& touch ); static const char* DEMO_THEME_ONE_PATH; diff --git a/examples/web-view/web-view-example.cpp b/examples/web-view/web-view-example.cpp index af668dc..bd371dd 100644 --- a/examples/web-view/web-view-example.cpp +++ b/examples/web-view/web-view-example.cpp @@ -100,7 +100,7 @@ public: mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() ); } - bool OnTouchText( Actor actor, const TouchData& touch ) + bool OnTouchText( Actor actor, const TouchEvent& touch ) { if ( touch.GetState( 0 ) == PointState::UP ) { diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp index 4d95f05..869bc7b 100644 --- a/shared/dali-table-view.cpp +++ b/shared/dali-table-view.cpp @@ -557,7 +557,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit return focusableTile; } -bool DaliTableView::OnTilePressed( Actor actor, const TouchData& event ) +bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) { return DoTilePress( actor, event.GetState( 0 ) ); } @@ -644,7 +644,7 @@ void DaliTableView::OnScrollComplete( const Dali::Vector2& position ) accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) ); } -bool DaliTableView::OnScrollTouched( Actor actor, const TouchData& event ) +bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event ) { if( PointState::DOWN == event.GetState( 0 ) ) { diff --git a/shared/dali-table-view.h b/shared/dali-table-view.h index beb85dd..aa94d38 100644 --- a/shared/dali-table-view.h +++ b/shared/dali-table-view.h @@ -2,7 +2,7 @@ #define DALI_DEMO_TABLEVIEW_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. @@ -150,7 +150,7 @@ private: // Application callbacks & implementation * * @return Consume flag */ - bool OnTilePressed( Dali::Actor actor, const Dali::TouchData& event ); + bool OnTilePressed( Dali::Actor actor, const Dali::TouchEvent& event ); /** * Called by OnTilePressed & Accessibility to do the appropriate action. @@ -211,7 +211,7 @@ private: // Application callbacks & implementation * * @return Consume flag */ - bool OnScrollTouched( Dali::Actor actor, const Dali::TouchData& event ); + bool OnScrollTouched( Dali::Actor actor, const Dali::TouchEvent& event ); /** * Setup the effect on the scroll view -- 2.7.4