/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
bool returnValue;
};
- Integration::TouchEvent GenerateSingleTouch(TouchPoint::State state, const Vector2& screenPosition)
+ Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition)
{
Integration::TouchEvent touchEvent;
Integration::Point point;
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);
+ application.GetScene().Add(control);
detector.Attach(control);
application.SendNotification();
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);
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
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);
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);
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
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);
control1.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
control2.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
- Stage::GetCurrent().Add(control1);
- Stage::GetCurrent().Add(control2);
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
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);
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);
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
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);
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);
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
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);
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);
+ application.GetScene().Add(control1);
+ application.GetScene().Add(control2);
detector.Attach(control1);
detector.Attach(control2);
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);