/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
*
*/
-#include <iostream>
#include <stdlib.h>
+#include <iostream>
// Need to override adaptor classes for toolkit test harness, so include
// test harness headers before dali headers.
namespace
{
- const int RENDER_FRAME_INTERVAL = 16;
- struct SignalData
- {
- SignalData()
- :functorCalled(false),
+const int RENDER_FRAME_INTERVAL = 16;
+struct SignalData
+{
+ SignalData()
+ : functorCalled(false),
control(),
detector()
- {
- }
+ {
+ }
- void Reset()
- {
- functorCalled = false;
- control.Reset();
- }
+ void Reset()
+ {
+ functorCalled = false;
+ control.Reset();
+ }
- bool functorCalled;
- Control control;
- Dali::Toolkit::DragAndDropDetector detector;
- };
+ bool functorCalled;
+ Control control;
+ Dali::Toolkit::DragAndDropDetector detector;
+};
- struct DragSignalFunctor
- {
- DragSignalFunctor(SignalData& data, bool returnValue = true)
- :signalData(data),
+struct DragSignalFunctor
+{
+ DragSignalFunctor(SignalData& data, bool returnValue = true)
+ : signalData(data),
returnValue(returnValue)
- {
- }
-
- bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector)
- {
- signalData.functorCalled = true;
- signalData.control = control;
- signalData.detector = detector;
- return returnValue;
- }
-
- SignalData& signalData;
- bool returnValue;
- };
-
- Integration::TouchEvent GenerateSingleTouch(TouchPoint::State state, const Vector2& screenPosition)
{
- Integration::TouchEvent touchEvent;
- Integration::Point point;
- point.SetState(static_cast<PointState::Type>(state));
- point.SetScreenPosition(screenPosition);
- touchEvent.points.push_back(point);
- return touchEvent;
}
+
+ bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector)
+ {
+ signalData.functorCalled = true;
+ signalData.control = control;
+ signalData.detector = detector;
+ return returnValue;
+ }
+
+ SignalData& signalData;
+ bool returnValue;
+};
+
+Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition)
+{
+ Integration::TouchEvent touchEvent;
+ Integration::Point point;
+ point.SetState(static_cast<PointState::Type>(state));
+ point.SetScreenPosition(screenPosition);
+ touchEvent.points.push_back(point);
+ return touchEvent;
}
+} // namespace
int UtcDaliDragAndDropDetectorConstructorN(void)
{
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control;
+ Control control;
detector.Attach(control);
DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control = Control::New();
+ Control control = Control::New();
detector.Attach(control);
DALI_TEST_EQUALS(1, detector.GetAttachedControlCount(), TEST_LOCATION);
}
int UtcDaliDragAndDropDetectorDetachN(void)
- {
+{
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1;
- Control control2 = Control::New();
+ Control control1;
+ Control control2 = Control::New();
detector.Attach(control1);
detector.Attach(control2);
DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION);
END_TEST;
-
}
int UtcDaliDragAndDropDetectorDetachP(void)
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- Control control3;
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ Control control3;
detector.Attach(control1);
detector.Attach(control2);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
+ Control control1 = Control::New();
+ Control control2 = Control::New();
detector.Attach(control1);
detector.Attach(control2);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
+ Control control1 = Control::New();
+ Control control2 = Control::New();
detector.Attach(control1);
detector.Attach(control2);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
+ Control control1 = Control::New();
+ Control control2 = Control::New();
detector.Attach(control1);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
+ Control control1 = Control::New();
+ Control control2 = Control::New();
detector.Attach(control1);
detector.Attach(control2);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control = Control::New();
- control.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(control);
+ Control control = Control::New();
+ control.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(control);
detector.Attach(control);
application.SendNotification();
DALI_TEST_CHECK(detector);
DALI_TEST_CHECK(control);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.StartedSignal().Connect(&application, functor);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
- control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
- control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+ control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.EnteredSignal().Connect(&application, functor);
TestGenerateMiniPan(application);
Vector2 screenCoordinates(10.0f, 110.0f);
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION);
data.Reset();
END_TEST;
-
}
int UtcDaliDragAndDropDetectorMovedSignal(void)
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
- control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
- control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+ control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.MovedSignal().Connect(&application, functor);
TestGenerateMiniPan(application);
Vector2 screenCoordinates(10.0f, 110.0f);
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
screenCoordinates.x = 10.0f;
screenCoordinates.y = 120.0f;
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(Vector2(10.0f, 120.0f), data.detector.GetCurrentScreenPosition(), TEST_LOCATION);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
- control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
- control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
- control1.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
- control2.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
-
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+ control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+ control1.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
+ control2.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
+
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.ExitedSignal().Connect(&application, functor);
TestGenerateMiniPan(application);
Vector2 screenCoordinates(10.0f, 110.0f);
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
screenCoordinates.x = 20.0f;
screenCoordinates.y = 20.0f;
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
- control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
- control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+ control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.DroppedSignal().Connect(&application, functor);
TestGenerateMiniPan(application);
Vector2 screenCoordinates(10.0f, 110.0f);
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
screenCoordinates.x = 10.0f;
screenCoordinates.y = 112.0f;
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Up, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::UP, screenCoordinates));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
- control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
- control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+ control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
detector.Attach(control1);
detector.Attach(control2);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.EndedSignal().Connect(&application, functor);
TestGenerateMiniPan(application);
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Down, Vector2(10.0f, 10.0f)));
+ application.ProcessEvent(GenerateSingleTouch(PointState::DOWN, Vector2(10.0f, 10.0f)));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(control1, data.control, TEST_LOCATION);
ToolkitTestApplication application;
Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
- Control control1 = Control::New();
- Control control2 = Control::New();
- control1.SetProperty( Dali::Actor::Property::NAME,"control1");
- control2.SetProperty( Dali::Actor::Property::NAME,"control2");
- control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
- control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
- control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
- control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ Control control1 = Control::New();
+ Control control2 = Control::New();
+ control1.SetProperty(Dali::Actor::Property::NAME, "control1");
+ control2.SetProperty(Dali::Actor::Property::NAME, "control2");
+ control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+ control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
- SignalData data;
+ SignalData data;
DragSignalFunctor functor(data);
detector.DroppedSignal().Connect(&application, functor);
TestGenerateMiniPan(application);
Vector2 screenCoordinates(10.0f, 110.0f);
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates));
screenCoordinates.x = 10.0f;
screenCoordinates.y = 112.0f;
- application.ProcessEvent(GenerateSingleTouch(TouchPoint::Up, screenCoordinates));
+ application.ProcessEvent(GenerateSingleTouch(PointState::UP, screenCoordinates));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION);