projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modify InputMethod enumeration in utc-Dali-TextField.cpp
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-touch-utils.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
index
68d50f2
..
28caca9
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
@@
-40,7
+40,7
@@
struct TouchEventData
receivedTouch.points.clear();
receivedTouch.time = 0;
receivedTouch.points.clear();
receivedTouch.time = 0;
- touchActor
= NULL
;
+ touchActor
.Reset()
;
}
bool functorCalled;
}
bool functorCalled;
@@
-62,10
+62,13
@@
struct TouchEventDataFunctor
}
// Generate a touch-event
}
// Generate a touch-event
- Integration::TouchEvent GenerateSingleTouch(
TouchPoint::State state, Vector2
screenPosition ) const
+ Integration::TouchEvent GenerateSingleTouch(
PointState::Type state, const Vector2&
screenPosition ) const
{
Integration::TouchEvent touchEvent;
{
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, state, screenPosition.x, screenPosition.y ) );
+ Integration::Point point;
+ point.SetState( state );
+ point.SetScreenPosition( screenPosition );
+ touchEvent.points.push_back( point );
return touchEvent;
}
return touchEvent;
}