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-adaptor.cpp;h=522537c02f5f7460de42c824357ed6236de9ad96;hp=c9805017fa2709f9bf196d952925705f7c68d9df;hb=refs%2Fchanges%2F53%2F207353%2F7;hpb=7e3ab0519037a17a1ac819d1ee71d99851433870 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp index c980501..522537c 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp @@ -15,8 +15,12 @@ * */ -// CLASS HEADER +#include + +// Don't want to include the actual window.h which otherwise will be indirectly included by adaptor.h. +#define DALI_WINDOW_H #include + #include #include @@ -36,6 +40,8 @@ namespace Adaptor bool Adaptor::mAvailable = false; Vector Adaptor::mCallbacks = Vector(); +Dali::WindowContainer Adaptor::mWindows; +Dali::Adaptor::WindowCreatedSignalType* Adaptor::mWindowCreatedSignal = nullptr; Dali::Adaptor& Adaptor::Get() { @@ -50,12 +56,27 @@ Dali::RenderSurfaceInterface& Adaptor::GetSurface() return *renderSurface; } +Dali::WindowContainer Adaptor::GetWindows() +{ + return Adaptor::mWindows; +} + Dali::Adaptor::AdaptorSignalType& Adaptor::AdaptorSignal() { Dali::Adaptor::AdaptorSignalType* signal = new Dali::Adaptor::AdaptorSignalType; return *signal; } +Dali::Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal() +{ + if ( !Adaptor::mWindowCreatedSignal ) + { + Adaptor::mWindowCreatedSignal = new Dali::Adaptor::WindowCreatedSignalType; + } + + return *Adaptor::mWindowCreatedSignal; +} + } // namespace Adaptor } // namespace Internal @@ -169,11 +190,21 @@ Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal() return Internal::Adaptor::Adaptor::AdaptorSignal(); } +Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal() +{ + return Internal::Adaptor::Adaptor::WindowCreatedSignal(); +} + Dali::RenderSurfaceInterface& Adaptor::GetSurface() { return Internal::Adaptor::Adaptor::GetSurface(); } +Dali::WindowContainer Adaptor::GetWindows() const +{ + return Internal::Adaptor::Adaptor::GetWindows(); +} + Any Adaptor::GetNativeWindowHandle() { Any window; @@ -256,6 +287,12 @@ const LogFactoryInterface& Adaptor::GetLogFactory() Adaptor::Adaptor() : mImpl( NULL ) { + Dali::PositionSize win_size; + win_size.width = 640; + win_size.height = 800; + + Dali::Window window = Dali::Window::New( win_size, "" ); + Internal::Adaptor::Adaptor::mWindows.push_back( window ); } } // namespace Dali