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%2Ftoolkit-scene-holder.cpp;h=e18809a1554f771834595749104fb010b4ca0258;hp=10757785acdff563303a32fe2f8945a841f64d20;hb=d8a4571d975ae061fe32f1d098d07ccc94604729;hpb=81529cb3b54f998306def4db0ba3f5f5a65c0c30 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp index 1075778..e18809a 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -47,7 +46,7 @@ namespace Adaptor SceneHolder::SceneHolder( const Dali::Rect& positionSize ) : mRenderSurface( positionSize ), - mScene( Dali::Integration::Scene::New( mRenderSurface ) ) + mScene( Dali::Integration::Scene::New( Dali::Size( static_cast( positionSize.width ), static_cast( positionSize.height ) ) ) ) { } @@ -106,9 +105,9 @@ Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEve return mScene.KeyEventGeneratedSignal(); } -Dali::Integration::SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +Dali::Integration::SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return mScene.TouchSignal(); + return mScene.TouchedSignal(); } Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() @@ -121,7 +120,7 @@ Integration::Scene SceneHolder::GetScene() return mScene; } -Integration::RenderSurface& SceneHolder::GetRenderSurface() +Dali::RenderSurfaceInterface& SceneHolder::GetRenderSurface() { return mRenderSurface; } @@ -226,9 +225,9 @@ SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal() return GetImplementation( *this ).KeyEventGeneratedSignal(); } -SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return GetImplementation( *this ).TouchSignal(); + return GetImplementation( *this ).TouchedSignal(); } SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()