projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a37b3f8
)
Revert "Changes after TouchData renamed to TouchEvent"
author
Joogab Yun
<joogab.yun@samsung.com>
Wed, 19 Aug 2020 05:23:46 +0000
(14:23 +0900)
committer
Joogab Yun
<joogab.yun@samsung.com>
Wed, 19 Aug 2020 05:23:46 +0000
(14:23 +0900)
This reverts commit
f00dca41f5430eea2ed3b00f0be2a010ceb3c664
.
48 files changed:
examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
patch
|
blob
|
history
examples/animated-gradient-card-active/animated-gradient-card-active.cpp
patch
|
blob
|
history
examples/arc-visual/arc-visual-example.cpp
patch
|
blob
|
history
examples/benchmark/benchmark.cpp
patch
|
blob
|
history
examples/bezier-curve/bezier-curve-example.cpp
patch
|
blob
|
history
examples/blocks/blocks-example.cpp
patch
|
blob
|
history
examples/bubble-effect/bubble-effect-example.cpp
patch
|
blob
|
history
examples/clipping-draw-order/clipping-draw-order.cpp
patch
|
blob
|
history
examples/color-visual/color-visual-example.cpp
patch
|
blob
|
history
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
patch
|
blob
|
history
examples/fpp-game/fpp-game-tutorial-controller.cpp
patch
|
blob
|
history
examples/fpp-game/fpp-game-tutorial-controller.h
patch
|
blob
|
history
examples/fpp-game/game-camera.cpp
patch
|
blob
|
history
examples/fpp-game/game-camera.h
patch
|
blob
|
history
examples/gaussian-blur-view/gaussian-blur-view-example.cpp
patch
|
blob
|
history
examples/gestures/gesture-example.cpp
patch
|
blob
|
history
examples/hello-world/hello-world-example.cpp
patch
|
blob
|
history
examples/homescreen-benchmark/homescreen-benchmark.cpp
patch
|
blob
|
history
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
patch
|
blob
|
history
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
patch
|
blob
|
history
examples/magnifier/magnifier-example.cpp
patch
|
blob
|
history
examples/mesh-visual/mesh-visual-example.cpp
patch
|
blob
|
history
examples/metaball-explosion/metaball-explosion-example.cpp
patch
|
blob
|
history
examples/metaball-refrac/metaball-refrac-example.cpp
patch
|
blob
|
history
examples/perf-scroll/perf-scroll.cpp
patch
|
blob
|
history
examples/ray-marching/ray-marching-example.cpp
patch
|
blob
|
history
examples/refraction-effect/refraction-effect-example.cpp
patch
|
blob
|
history
examples/remote-image-loading/remote-image-loading-example.cpp
patch
|
blob
|
history
examples/renderer-stencil/renderer-stencil-example.cpp
patch
|
blob
|
history
examples/rendering-basic-light/rendering-basic-light-example.cpp
patch
|
blob
|
history
examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
patch
|
blob
|
history
examples/rendering-cube/rendering-cube.cpp
patch
|
blob
|
history
examples/rendering-line/rendering-line.cpp
patch
|
blob
|
history
examples/rendering-radial-progress/radial-progress.cpp
patch
|
blob
|
history
examples/rendering-skybox/look-camera.cpp
patch
|
blob
|
history
examples/rendering-skybox/look-camera.h
patch
|
blob
|
history
examples/rendering-textured-cube/rendering-textured-cube.cpp
patch
|
blob
|
history
examples/rendering-triangle/rendering-triangle.cpp
patch
|
blob
|
history
examples/scroll-view/scroll-view-example.cpp
patch
|
blob
|
history
examples/text-field/text-field-example.cpp
patch
|
blob
|
history
examples/text-label-emojis/text-label-emojis.cpp
patch
|
blob
|
history
examples/text-label-multi-language/text-label-multi-language-example.cpp
patch
|
blob
|
history
examples/tilt/tilt-example.cpp
patch
|
blob
|
history
examples/visual-transitions/transition-application.cpp
patch
|
blob
|
history
examples/visual-transitions/transition-application.h
patch
|
blob
|
history
examples/web-view/web-view-example.cpp
patch
|
blob
|
history
shared/dali-table-view.cpp
patch
|
blob
|
history
shared/dali-table-view.h
patch
|
blob
|
history
diff --git
a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
index
6ed10ed
..
4a80e59
100644
(file)
--- 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 );
}
window.TouchSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched );
}
- void OnTouched( const Touch
Event& touch
)
+ void OnTouched( const Touch
Data& touchData
)
{
static bool touched = false;
{
static bool touched = false;
- if( touch.GetState( 0 ) == PointState::DOWN )
+ if( touch
Data
.GetState( 0 ) == PointState::DOWN )
{
touched = true;
}
{
touched = true;
}
- if( touch
.GetState( 0 ) == PointState::UP && touched
)
+ if( touch
Data.GetState( 0 ) == PointState::UP && touched
)
{
mImageCombinationIndex++;
touched = false;
{
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
9861aa4
..
7ec7d9f
100644
(file)
--- 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();
}
Reset();
}
- bool OnTouchCards(Actor actor, const Touch
Event
&data)
+ bool OnTouchCards(Actor actor, const Touch
Data
&data)
{
if( data.GetPointCount() > 0 )
{
{
if( data.GetPointCount() > 0 )
{
@@
-347,7
+347,7
@@
public:
return true;
}
return true;
}
- bool OnTouchLayer(Actor actor, const Touch
Event
&data)
+ bool OnTouchLayer(Actor actor, const Touch
Data
&data)
{
if( data.GetPointCount() > 0 )
{
{
if( data.GetPointCount() > 0 )
{
diff --git
a/examples/arc-visual/arc-visual-example.cpp
b/examples/arc-visual/arc-visual-example.cpp
index
88e4253
..
3131981
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent );
}
- bool OnButtonTouch( Actor actor, const Touch
Event
& touch )
+ bool OnButtonTouch( Actor actor, const Touch
Data
& touch )
{
if( touch.GetState( 0 ) == PointState::UP )
{
{
if( touch.GetState( 0 ) == PointState::UP )
{
@@
-212,7
+212,7
@@
private:
return true;
}
return true;
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
if( touch.GetState( 0 ) == PointState::UP )
{
{
if( touch.GetState( 0 ) == PointState::UP )
{
diff --git
a/examples/benchmark/benchmark.cpp
b/examples/benchmark/benchmark.cpp
index
7a12692
..
e8755a5
100644
(file)
--- a/
examples/benchmark/benchmark.cpp
+++ b/
examples/benchmark/benchmark.cpp
@@
-256,7
+256,7
@@
public:
ShowAnimation();
}
ShowAnimation();
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/bezier-curve/bezier-curve-example.cpp
b/examples/bezier-curve/bezier-curve-example.cpp
index
677152e
..
38405af
100644
(file)
--- 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 Touch
Event
& event )
+ bool OnTouchControlPoint( Actor controlPoint, const Touch
Data
& event )
{
if( event.GetPointCount() > 0 )
{
{
if( event.GetPointCount() > 0 )
{
@@
-510,7
+510,7
@@
public:
return false; // Don't mark this as consumed - let the layer get the touch
}
return false; // Don't mark this as consumed - let the layer get the touch
}
- bool OnTouchLayer( Actor actor, const Touch
Event
& event )
+ bool OnTouchLayer( Actor actor, const Touch
Data
& event )
{
if( event.GetPointCount() > 0 )
{
{
if( event.GetPointCount() > 0 )
{
diff --git
a/examples/blocks/blocks-example.cpp
b/examples/blocks/blocks-example.cpp
index
300f057
..
66c9916
100644
(file)
--- 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
*/
* @param[in] actor The actor touched
* @param[in] event The touch event
*/
- bool OnTouchPaddle(Actor actor, const Touch
Event
& event)
+ bool OnTouchPaddle(Actor actor, const Touch
Data
& event)
{
if(event.GetPointCount()>0)
{
{
if(event.GetPointCount()>0)
{
@@
-641,7
+641,7
@@
private:
* @param[in] actor The actor touched
* @param[in] event The touch event
*/
* @param[in] actor The actor touched
* @param[in] event The touch event
*/
- bool OnTouchLayer(Actor actor, const Touch
Event
& event)
+ bool OnTouchLayer(Actor actor, const Touch
Data
& event)
{
if(event.GetPointCount()>0)
{
{
if(event.GetPointCount()>0)
{
diff --git
a/examples/bubble-effect/bubble-effect-example.cpp
b/examples/bubble-effect/bubble-effect-example.cpp
index
58c7888
..
ad6b774
100644
(file)
--- 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
}
// Callback function of the touch signal on the background
- bool OnTouch(Dali::Actor actor, const Dali::Touch
Event
& event)
+ bool OnTouch(Dali::Actor actor, const Dali::Touch
Data
& event)
{
switch( event.GetState( 0 ) )
{
{
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
363ef09
..
c8a5775
100644
(file)
--- 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 );
}
window.GetRootLayer().TouchSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// Quit the application.
mApplication.Quit();
{
// Quit the application.
mApplication.Quit();
diff --git
a/examples/color-visual/color-visual-example.cpp
b/examples/color-visual/color-visual-example.cpp
index
27c85d2
..
d96e586
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &ColorVisualExample::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
if( touch.GetState( 0 ) == PointState::UP )
{
{
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
912d6f4
..
ec957ce
100644
(file)
--- 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);
}
window.KeyEventSignal().Connect(this, &CompressedTextureFormatsController::OnKeyEvent);
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// 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
7ee29f1
..
ef20090
100644
(file)
--- 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 "fpp-game-tutorial-controller.h"
-#include <dali/public-api/events/touch-
event
.h>
+#include <dali/public-api/events/touch-
data
.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/object/property-map.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/object/property-map.h>
@@
-40,7
+40,7
@@
FppGameTutorialController::~FppGameTutorialController()
}
}
-void FppGameTutorialController::OnTouch( const Touch
Event
& touchEvent )
+void FppGameTutorialController::OnTouch( const Touch
Data
& touchEvent )
{
Vector2 size( mWindow.GetSize() );
{
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
cc09dae
..
cafdeb6
100644
(file)
--- 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
*/
* Handles tutorial touch input
* @param[in] touchEvent Incoming touch event in the UI space
*/
- void OnTouch( const Dali::Touch
Event
& touchEvent );
+ void OnTouch( const Dali::Touch
Data
& touchEvent );
/**
* Handles tutorial animation finished signal
/**
* Handles tutorial animation finished signal
diff --git
a/examples/fpp-game/game-camera.cpp
b/examples/fpp-game/game-camera.cpp
index
2d33dc6
..
975dafa
100644
(file)
--- a/
examples/fpp-game/game-camera.cpp
+++ b/
examples/fpp-game/game-camera.cpp
@@
-19,7
+19,7
@@
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/render-tasks/render-task.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/events/touch-
event
.h>
+#include <dali/public-api/events/touch-
data
.h>
using namespace Dali;
using namespace Dali;
@@
-204,7
+204,7
@@
void GameCamera::CreateInterceptorActor()
mInterceptorActor.TouchSignal().Connect( this, &GameCamera::OnTouch );
}
mInterceptorActor.TouchSignal().Connect( this, &GameCamera::OnTouch );
}
-bool GameCamera::OnTouch( Actor actor, const Touch
Event
& touch )
+bool GameCamera::OnTouch( Actor actor, const Touch
Data
& touch )
{
for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i )
{
{
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
879af85
..
edbfdc8
100644
(file)
--- 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
*/
* @param[in] actor Actor receiving signal
* @param[in] touch Touch data
*/
- bool OnTouch( Dali::Actor actor, const Dali::Touch
Event
& touch );
+ bool OnTouch( Dali::Actor actor, const Dali::Touch
Data
& touch );
/**
* Handles camera tick() update
/**
* 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
d93703d
..
b3651d0
100644
(file)
--- 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 );
}
window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
const PointState::Type state = touch.GetState( 0 );
{
const PointState::Type state = touch.GetState( 0 );
diff --git
a/examples/gestures/gesture-example.cpp
b/examples/gestures/gesture-example.cpp
index
0bbeba1
..
c76496b
100644
(file)
--- 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
*/
* @param[in] actor The touched actor
* @param[in] touch The touch event
*/
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
switch( touch.GetState( 0 ) )
{
{
switch( touch.GetState( 0 ) )
{
diff --git
a/examples/hello-world/hello-world-example.cpp
b/examples/hello-world/hello-world-example.cpp
index
8e19077
..
22a13ab
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/homescreen-benchmark/homescreen-benchmark.cpp
b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index
cde8ee0
..
e47e5be
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// Quit the application.
mApplication.Quit();
{
// 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
ea8290f
..
c6f842e
100644
(file)
--- 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 Touch
Event
& event )
+ bool OnControlTouched( Actor actor, const Touch
Data
& event )
{
if(event.GetPointCount() > 0)
{
{
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
567c569
..
cd6c837
100644
(file)
--- 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.
*/
* @param[in] actor The actor touched
* @param[in] event The Touch information.
*/
- bool OnTouchImage( Actor actor, const Touch
Event
& event )
+ bool OnTouchImage( Actor actor, const Touch
Data
& event )
{
if( ( event.GetPointCount() > 0 ) && ( !mScrolling ) )
{
{
if( ( event.GetPointCount() > 0 ) && ( !mScrolling ) )
{
diff --git
a/examples/magnifier/magnifier-example.cpp
b/examples/magnifier/magnifier-example.cpp
index
305485a
..
e1d7b6b
100644
(file)
--- 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
*/
* @param[in] actor The actor that received the touch
* @param[in] event The touch-event information
*/
- bool OnTouched( Actor actor, const Touch
Event
& event )
+ bool OnTouched( Actor actor, const Touch
Data
& event )
{
if(event.GetPointCount() > 0)
{
{
if(event.GetPointCount() > 0)
{
diff --git
a/examples/mesh-visual/mesh-visual-example.cpp
b/examples/mesh-visual/mesh-visual-example.cpp
index
9697649
..
02fef7e
100644
(file)
--- 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.
//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 Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
switch( touch.GetState( 0 ) )
{
{
switch( touch.GetState( 0 ) )
{
diff --git
a/examples/metaball-explosion/metaball-explosion-example.cpp
b/examples/metaball-explosion/metaball-explosion-example.cpp
index
0eae70b
..
5601a00
100644
(file)
--- 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
*/
* Touch event handler to center metaballs at touch position
* and start explosion animation on release
*/
- bool OnTouch( Actor actor, const Touch
Event
& touch );
+ bool OnTouch( Actor actor, const Touch
Data
& touch );
/**
* Key event handler to quit application on escape or back key
/**
* 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 );
}
mCompositionActor.SetProperty( mPositionIndex, metaballCenter );
}
-bool MetaballExplosionController::OnTouch( Actor actor, const Touch
Event
& touch )
+bool MetaballExplosionController::OnTouch( Actor actor, const Touch
Data
& touch )
{
float aspectR = mScreenSize.y / mScreenSize.x;
{
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
e66ecde
..
2184a7a
100644
(file)
--- 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
*/
/**
* Touch handler, start the grow animation and creates additional metaballs
*/
- bool OnTouch( Actor actor, const Touch
Event
& touch );
+ bool OnTouch( Actor actor, const Touch
Data
& touch );
/**
* Key event callback to quit the application on escape or back key
/**
* 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 Touch
Event
& touch )
+bool MetaballRefracController::OnTouch( Actor actor, const Touch
Data
& touch )
{
const float aspect = mScreenSize.y / mScreenSize.x;
switch( touch.GetState( 0 ) )
{
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
35dca01
..
be98e66
100644
(file)
--- a/
examples/perf-scroll/perf-scroll.cpp
+++ b/
examples/perf-scroll/perf-scroll.cpp
@@
-261,7
+261,7
@@
public:
ShowAnimation();
}
ShowAnimation();
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/ray-marching/ray-marching-example.cpp
b/examples/ray-marching/ray-marching-example.cpp
index
0660bec
..
7ea5486
100644
(file)
--- a/
examples/ray-marching/ray-marching-example.cpp
+++ b/
examples/ray-marching/ray-marching-example.cpp
@@
-137,7
+137,7
@@
public:
AddContentLayer();
}
AddContentLayer();
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/refraction-effect/refraction-effect-example.cpp
b/examples/refraction-effect/refraction-effect-example.cpp
index
804e784
..
e995e60
100644
(file)
--- a/
examples/refraction-effect/refraction-effect-example.cpp
+++ b/
examples/refraction-effect/refraction-effect-example.cpp
@@
-352,7
+352,7
@@
private:
return true;
}
return true;
}
- bool OnTouch( Actor actor, const Touch
Event
& event )
+ bool OnTouch( Actor actor, const Touch
Data
& event )
{
switch( event.GetState( 0 ) )
{
{
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
a58abf4
..
5bf7e1f
100644
(file)
--- 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 Touch
Event
&touch)
+ void OnTouch(const Touch
Data
&touch)
{
if (touch.GetState(0) == PointState::DOWN)
{
{
if (touch.GetState(0) == PointState::DOWN)
{
@@
-165,7
+165,7
@@
public:
return false;
}
return false;
}
- bool OnControlTouch(Actor actor, const Touch
Event
&touch)
+ bool OnControlTouch(Actor actor, const Touch
Data
&touch)
{
if (touch.GetState(0) == PointState::DOWN)
{
{
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
e9004db
..
9868596
100644
(file)
--- 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
*/
* @param[in] touch The touch information
* @return True if the event has been handled
*/
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// Quit the application.
mApplication.Quit();
{
// 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
7d89a77
..
f9b960b
100644
(file)
--- 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
*/
/**
* This function will change the material of the cube when touched
*/
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
if(touch.GetState(0) == PointState::UP)
{
{
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
7d15eab
..
c333bc3
100644
(file)
--- 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
*/
/**
* This function will change the material Roughness, Metalness or the model orientation when touched
*/
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
const PointState::Type state = touch.GetState( 0 );
{
const PointState::Type state = touch.GetState( 0 );
diff --git
a/examples/rendering-cube/rendering-cube.cpp
b/examples/rendering-cube/rendering-cube.cpp
index
9b4260f
..
e7059ff
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/rendering-line/rendering-line.cpp
b/examples/rendering-line/rendering-line.cpp
index
1f421ad
..
2d6dbe3
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &DrawLineController::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/rendering-radial-progress/radial-progress.cpp
b/examples/rendering-radial-progress/radial-progress.cpp
index
e3133ca
..
2c7008b
100644
(file)
--- 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 );
}
window.GetRootLayer().TouchSignal().Connect( this, &RadialProgressController::OnTouch );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/rendering-skybox/look-camera.cpp
b/examples/rendering-skybox/look-camera.cpp
index
54f0c8a
..
1ef3194
100644
(file)
--- a/
examples/rendering-skybox/look-camera.cpp
+++ b/
examples/rendering-skybox/look-camera.cpp
@@
-19,7
+19,7
@@
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/render-tasks/render-task.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/events/touch-
event
.h>
+#include <dali/public-api/events/touch-
data
.h>
using namespace Dali;
using namespace Dali;
@@
-147,7
+147,7
@@
void LookCamera::CreateInterceptorActor()
mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch );
}
mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch );
}
-bool LookCamera::OnTouch( Actor actor, const Touch
Event
& touch )
+bool LookCamera::OnTouch( Actor actor, const Touch
Data
& touch )
{
for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i )
{
{
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
4ab6fee
..
4a0dc92
100644
(file)
--- 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
*/
* @param[in] actor Actor receiving signal
* @param[in] touch Touch data
*/
- bool OnTouch( Dali::Actor actor, const Dali::Touch
Event
& touch );
+ bool OnTouch( Dali::Actor actor, const Dali::Touch
Data
& touch );
/**
* Handles camera tick() update
/**
* 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
be22567
..
cc20719
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &TexturedCubeController::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/rendering-triangle/rendering-triangle.cpp
b/examples/rendering-triangle/rendering-triangle.cpp
index
c69f323
..
58fedcb
100644
(file)
--- 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 );
}
window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent );
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/scroll-view/scroll-view-example.cpp
b/examples/scroll-view/scroll-view-example.cpp
index
e9c65d0
..
ab7789a
100644
(file)
--- 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.
*/
* @param[in] actor The actor touched
* @param[in] event The touch information.
*/
- bool OnTouchImage( Actor actor, const Touch
Event
& event )
+ bool OnTouchImage( Actor actor, const Touch
Data
& event )
{
if( (event.GetPointCount() > 0) && (!mScrolling) )
{
{
if( (event.GetPointCount() > 0) && (!mScrolling) )
{
diff --git
a/examples/text-field/text-field-example.cpp
b/examples/text-field/text-field-example.cpp
index
8e9614e
..
b2478b3
100644
(file)
--- a/
examples/text-field/text-field-example.cpp
+++ b/
examples/text-field/text-field-example.cpp
@@
-151,7
+151,7
@@
public:
mField.Reset();
}
mField.Reset();
}
- bool OnPopupTouched( Actor actor, const Touch
Event
& event )
+ bool OnPopupTouched( Actor actor, const Touch
Data
& event )
{
// End edit mode for TextField if parent Popup touched.
if(event.GetPointCount() > 0)
{
// 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
6068e61
..
3c96974
100644
(file)
--- 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 Touch
Event
& event )
+ bool OnTouch( Actor actor, const Touch
Data
& event )
{
if( 1u == event.GetPointCount() )
{
{
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
a1a9b8e
..
d55d2a7
100644
(file)
--- 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 Touch
Event
& event )
+ bool OnTouch( Actor actor, const Touch
Data
& event )
{
if( 1u == event.GetPointCount() )
{
{
if( 1u == event.GetPointCount() )
{
diff --git
a/examples/tilt/tilt-example.cpp
b/examples/tilt/tilt-example.cpp
index
aaee512
..
06bf64e
100644
(file)
--- a/
examples/tilt/tilt-example.cpp
+++ b/
examples/tilt/tilt-example.cpp
@@
-74,7
+74,7
@@
public:
}
}
}
}
- bool OnTouch( Actor actor, const Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
{
// quit the application
mApplication.Quit();
diff --git
a/examples/visual-transitions/transition-application.cpp
b/examples/visual-transitions/transition-application.cpp
index
70b330d
..
b721341
100644
(file)
--- 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 Touch
Event& touch
)
+bool TransitionApplication::OnVisualButtonClicked( Actor actor, const Touch
Data& touchData
)
{
{
- if( touch.GetState(0) == PointState::FINISHED )
+ if( touch
Data
.GetState(0) == PointState::FINISHED )
{
int visual = actor.GetProperty<int>( mVisualIndex );
Property::Map map;
{
int visual = actor.GetProperty<int>( mVisualIndex );
Property::Map map;
diff --git
a/examples/visual-transitions/transition-application.h
b/examples/visual-transitions/transition-application.h
index
6f6e722
..
9846c11
100644
(file)
--- a/
examples/visual-transitions/transition-application.h
+++ b/
examples/visual-transitions/transition-application.h
@@
-2,7
+2,7
@@
#define DALI_DEMO_TRANSITION_APPLICATION_H
/*
#define DALI_DEMO_TRANSITION_APPLICATION_H
/*
- * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
16
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.
*
* 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 );
void OnKeyEvent( const KeyEvent& event );
bool OnActionButtonClicked( Button button );
- bool OnVisualButtonClicked( Actor actor, const Touch
Event& touch
);
+ bool OnVisualButtonClicked( Actor actor, const Touch
Data& touchData
);
static const char* DEMO_THEME_ONE_PATH;
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
bd371dd
..
af668dc
100644
(file)
--- 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() );
}
mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() );
}
- bool OnTouchText( Actor actor, const Touch
Event
& touch )
+ bool OnTouchText( Actor actor, const Touch
Data
& touch )
{
if ( touch.GetState( 0 ) == PointState::UP )
{
{
if ( touch.GetState( 0 ) == PointState::UP )
{
diff --git
a/shared/dali-table-view.cpp
b/shared/dali-table-view.cpp
index
869bc7b
..
4d95f05
100644
(file)
--- 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;
}
return focusableTile;
}
-bool DaliTableView::OnTilePressed( Actor actor, const Touch
Event
& event )
+bool DaliTableView::OnTilePressed( Actor actor, const Touch
Data
& event )
{
return DoTilePress( actor, event.GetState( 0 ) );
}
{
return DoTilePress( actor, event.GetState( 0 ) );
}
@@
-644,7
+644,7
@@
void DaliTableView::OnScrollComplete( const Dali::Vector2& position )
accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
}
accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
}
-bool DaliTableView::OnScrollTouched( Actor actor, const Touch
Event
& event )
+bool DaliTableView::OnScrollTouched( Actor actor, const Touch
Data
& event )
{
if( PointState::DOWN == event.GetState( 0 ) )
{
{
if( PointState::DOWN == event.GetState( 0 ) )
{
diff --git
a/shared/dali-table-view.h
b/shared/dali-table-view.h
index
aa94d38
..
beb85dd
100644
(file)
--- a/
shared/dali-table-view.h
+++ b/
shared/dali-table-view.h
@@
-2,7
+2,7
@@
#define DALI_DEMO_TABLEVIEW_H
/*
#define DALI_DEMO_TABLEVIEW_H
/*
- * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
19
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.
*
* 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
*/
*
* @return Consume flag
*/
- bool OnTilePressed( Dali::Actor actor, const Dali::Touch
Event
& event );
+ bool OnTilePressed( Dali::Actor actor, const Dali::Touch
Data
& event );
/**
* Called by OnTilePressed & Accessibility to do the appropriate action.
/**
* Called by OnTilePressed & Accessibility to do the appropriate action.
@@
-211,7
+211,7
@@
private: // Application callbacks & implementation
*
* @return Consume flag
*/
*
* @return Consume flag
*/
- bool OnScrollTouched( Dali::Actor actor, const Dali::Touch
Event
& event );
+ bool OnScrollTouched( Dali::Actor actor, const Dali::Touch
Data
& event );
/**
* Setup the effect on the scroll view
/**
* Setup the effect on the scroll view