X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-touch-utils.h;h=28caca9bfe89616be79579b1b5a366ab44703a37;hp=68d50f2e5c22f238888fb30ad0480a3184439181;hb=d07dc4c4a6067ba3080184d862bca40a90d1789c;hpb=0c33391ce2d6825b8207a7561656683a9408b8fd 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 --- 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; - touchActor = NULL; + touchActor.Reset(); } bool functorCalled; @@ -62,10 +62,13 @@ struct TouchEventDataFunctor } // 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; - 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; }