-#ifndef _TEST_TOUCH_UTILS_H_
-#define _TEST_TOUCH_UTILS_H_
+#ifndef TEST_TOUCH_UTILS_H
+#define TEST_TOUCH_UTILS_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
receivedTouch.points.clear();
receivedTouch.time = 0;
- touchActor = NULL;
+ touchActor.Reset();
}
bool functorCalled;
}
// 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;
}
} // namespace Dali
-#endif // _TEST_TOUCH_UTILS_H_
+#endif // TEST_TOUCH_UTILS_H