X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-window.cpp;h=9ab50210c199a9d79bb0a4d7e4aeccefd42e769a;hb=7018f61b640b6fcf9cb576b537bafcb6bb8240e8;hp=d7878e31e629c4371572762d9a5333710bf56274;hpb=19c7495f5e82eb301e7af38370ea2897e7324b7b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp index d7878e3..9ab5021 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp @@ -21,7 +21,6 @@ // EXTERNAL INCLUDES #include #include -#include #include #define DALI_WINDOW_H @@ -47,6 +46,8 @@ namespace Adaptor Window::Window( const PositionSize& positionSize ) : SceneHolder( positionSize ), mFocusChangeSignal(), + mResizeSignal(), + mRotationAngle(90), // dummy angle for test coverage mVisibilityChangedSignal() { } @@ -81,16 +82,13 @@ Window::~Window() { } -Window::Window(const Window& handle) -: BaseHandle( handle ) -{ -} +Window::Window( const Window& copy ) = default; -Window& Window::operator=(const Window& rhs) -{ - BaseHandle::operator=(rhs); - return *this; -} +Window& Window::operator=( const Window& rhs ) = default; + +Window::Window( Window&& rhs ) = default; + +Window& Window::operator=( Window&& rhs ) = default; Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent ) { @@ -164,6 +162,21 @@ FocusChangeSignalType& Window::FocusChangeSignal() return GetImplementation( *this ).mFocusChangeSignal; } +ResizeSignalType& Window::ResizeSignal() +{ + return GetImplementation( *this ).mResizeSignal; +} + +Window::KeyEventSignalType& Window::KeyEventSignal() +{ + return GetImplementation( *this ).KeyEventSignal(); +} + +Window::TouchEventSignalType& Window::TouchedSignal() +{ + return GetImplementation( *this ).TouchedSignal(); +} + namespace DevelWindow { @@ -189,24 +202,35 @@ Window DownCast( BaseHandle handle ) return Dali::Window( windowImpl ); } -EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window ) +void SetPositionSize(Window window, PositionSize positionSize) { - return GetImplementation( window ).GetScene().EventProcessingFinishedSignal(); + Uint16Pair newSize(positionSize.width, positionSize.height); + GetImplementation( window ).mResizeSignal.Emit(window,newSize); } -KeyEventSignalType& KeyEventSignal( Window window ) +int GetPhysicalOrientation(Window window) { - return GetImplementation( window ).KeyEventSignal(); + return GetImplementation( window ).mRotationAngle; } -KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ) +void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId ) { - return GetImplementation( window ).KeyEventGeneratedSignal(); + CallbackBase::Execute( *callback, frameId ); +} + +void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId ) +{ + CallbackBase::Execute( *callback, frameId ); } -TouchSignalType& TouchSignal( Window window ) +EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window ) { - return GetImplementation( window ).TouchSignal(); + return GetImplementation( window ).GetScene().EventProcessingFinishedSignal(); +} + +KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ) +{ + return GetImplementation( window ).KeyEventGeneratedSignal(); } WheelEventSignalType& WheelEventSignal( Window window )