/*
- * 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.
gOnScrollCompleteCalled = true;
}
-ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
+ScrollView SetupTestScrollView(Integration::Scene scene, int rows, int columns, Vector2 size)
{
Constraint constraint;
scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
- Stage::GetCurrent().Add( scrollView );
+ scene.Add( scrollView );
RulerPtr rulerX = CreateRuler(size.width);
RulerPtr rulerY = CreateRuler(size.height);
if(columns > 1)
scrollView.SetRulerX( rulerX );
scrollView.SetRulerY( rulerY );
- Stage::GetCurrent().Add( scrollView );
+ scene.Add( scrollView );
Actor container = Actor::New();
container.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
ToolkitTestApplication application;
tet_infoline(" UtcDaliScrollViewPagePathEffectTest");
- Vector2 size = Stage::GetCurrent().GetSize();
+ Vector2 size = application.GetScene().GetSize();
- ScrollView scrollView = SetupTestScrollView(1, 3, size);
+ ScrollView scrollView = SetupTestScrollView(application.GetScene(), 1, 3, size);
Actor testPage = gPages[2];
Wait(application, 500);