X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-window.cpp;h=2b15b2b287424a0fc4832613ffe3d8891454e628;hb=d7cef550d3627f3a161913ab1805a7faf0a15f36;hp=1b8cdbd679fb0b1d9f8e59fcc2ae48f9c45b6277;hpb=71f37f16f983957d32defb8456fade32c99fcfef;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 1b8cdbd..2b15b2b 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
@@ -24,9 +24,15 @@
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/base-object.h>
 
+#define DALI_WINDOW_H
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <toolkit-adaptor-impl.h>
+
 // INTERNAL INCLUDES
 #include "test-render-surface.h"
 
+using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
+
 namespace Dali
 {
 
@@ -45,25 +51,20 @@ class Window : public Dali::BaseObject
 public:
 
   Window( const PositionSize& positionSize )
-  : mScene( Dali::Integration::Scene::New( Size( positionSize.width, positionSize.height ) ) ),
-    mRenderSurface( new TestRenderSurface( positionSize ) )
+  : mRenderSurface( positionSize ),
+    mScene( Dali::Integration::Scene::New( mRenderSurface ) )
   {
-    mScene.SetSurface( *mRenderSurface );
   }
 
-  virtual ~Window()
-  {
-    delete mRenderSurface;
-    mRenderSurface = nullptr;
-  }
+  virtual ~Window() = default;
 
   static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent)
   {
     return new Window( positionSize );
   }
 
+  TestRenderSurface mRenderSurface;
   Integration::Scene mScene;
-  TestRenderSurface* mRenderSurface;
 };
 
 } // Adaptor
@@ -97,13 +98,15 @@ Window& Window::operator=(const Window& rhs)
 
 Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent )
 {
-  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( windowPosition, name, "", isTransparent );
-  return Window( window );
+  return New( windowPosition, name, "", isTransparent );
 }
 
 Dali::Window Window::New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent )
 {
   Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( windowPosition, name, className, isTransparent );
+  Dali::Window newWindow = Window( window );
+  Dali::Adaptor::WindowCreatedSignalType& windowCreatedSignal = AdaptorImpl::Get().WindowCreatedSignal();
+  windowCreatedSignal.Emit( newWindow );
   return Window( window );
 }
 
@@ -124,7 +127,7 @@ Integration::Scene Window::GetScene()
 
 Integration::RenderSurface& Window::GetRenderSurface()
 {
-  return *GetImplementation( *this ).mRenderSurface;
+  return GetImplementation( *this ).mRenderSurface;
 }
 
 namespace DevelWindow
@@ -145,6 +148,11 @@ KeyEventSignalType& KeyEventSignal( Window window )
   return GetImplementation( window ).mScene.KeyEventSignal();
 }
 
+KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
+{
+  return GetImplementation( window ).mScene.KeyEventGeneratedSignal();
+}
+
 TouchSignalType& TouchSignal( Window window )
 {
   return GetImplementation( window ).mScene.TouchSignal();
@@ -154,7 +162,6 @@ WheelEventSignalType& WheelEventSignal( Window window )
 {
   return GetImplementation( window ).mScene.WheelEventSignal();
 }
-
 } // namespace DevelWindow
 
 } // Dali