[Tizen] Revert "Support scene holder instead of window in keyinput/keyboard focus"

- TV CSFS crash issue, revert to resolve release blocking issue.

This reverts commit b3a97840ef9163145f3adc947cf1c6679911d754.

Change-Id: I2a3e81523dd69d173726eb85d62d0e47f5d99e54

diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
index cc0b3ba7d7c235f7f7b4ee1c4b910e21dec872cc..2f47d0f8abee24266c2b9ec1ac4bd7fcef4ec9e8 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@ -51,7 +51,6 @@ LIST(APPEND TC_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp

diff --git a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
index f53fdfd28c63342f79a94b8dd99085f8d659b8f7..24968ee9480a99569d53c657e88917213b4979aa 100644 (file)
--- a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
@@ -37,7 +37,6 @@ LIST(APPEND TC_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-virtual-keyboard.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.cpp

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
index 2feb3e02cb91d91d92461e99154b91dba3f198eb..f9f12bf5bb2e227e276c3e1f00f483f2e8992023 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
@@ -77,7 +77,6 @@ public:
 
   Dali::RenderSurfaceInterface& GetSurface();
   Dali::WindowContainer GetWindows();
-  Dali::SceneHolderList GetSceneHolders();
 
   Dali::Internal::Adaptor::SceneHolder* GetWindow( Dali::Actor& actor );
   void AddWindow( Internal::Adaptor::SceneHolder* window );
@@ -93,7 +92,7 @@ public:
 private:
 
   Vector<CallbackBase*> mCallbacks;
-  std::vector<Internal::Adaptor::SceneHolder*> mWindows;
+  Dali::WindowContainer mWindows;
   Dali::Adaptor::AdaptorSignalType mResizedSignal;
   Dali::Adaptor::AdaptorSignalType mLanguageChangedSignal;
   Dali::Adaptor::WindowCreatedSignalType mWindowCreatedSignal;

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 6300ddb84bc69d7a0374da2858a17dca99dfd808..429145a8de196c86b113108af537b8373c06830a 100644 (file)
--- 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
@@ -24,7 +24,6 @@
 #include <dali/integration-api/adaptors/adaptor.h>
 
 #include <dali/integration-api/adaptors/scene-holder.h>
-#include <toolkit-scene-holder-impl.h>
 
 #include <toolkit-adaptor-impl.h>
 #include <dali/integration-api/debug.h>
@@ -97,7 +96,11 @@ Adaptor::~Adaptor()
 
 void Adaptor::Start( Dali::Window window )
 {
-  AddWindow( &GetImplementation( window ) );
+  if ( window )
+  {
+    mWindows.push_back( window );
+    mWindowCreatedSignal.Emit( window );
+  }
 }
 
 Integration::Scene Adaptor::GetScene( Dali::Window window )
@@ -151,53 +154,6 @@ Dali::WindowContainer Adaptor::GetWindows()
   return windows;
 }
 
-Dali::SceneHolderList Adaptor::GetSceneHolders()
-{
-  Dali::SceneHolderList sceneHolderList;
-
-  for( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter )
-  {
-    sceneHolderList.push_back( Dali::Integration::SceneHolder( *iter ) );
-  }
-
-  return sceneHolderList;
-}
-
-Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor )
-{
-  Dali::Integration::Scene scene = Dali::Integration::Scene::Get( actor );
-
-  for( auto window : mWindows )
-  {
-    if ( scene == window->GetScene() )
-    {
-      return window;
-    }
-  }
-
-  return nullptr;
-}
-
-void Adaptor::AddWindow( Internal::Adaptor::SceneHolder* window )
-{
-  if ( window )
-  {
-    mWindows.push_back( window );
-
-    Dali::Integration::SceneHolder newWindow( window );
-    mWindowCreatedSignal.Emit( newWindow );
-  }
-}
-
-void Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* window )
-{
-  auto iter = std::find( mWindows.begin(), mWindows.end(), window );
-  if( iter != mWindows.end() )
-  {
-    mWindows.erase( iter );
-  }
-}
-
 Dali::Adaptor::AdaptorSignalType& Adaptor::ResizedSignal()
 {
   return mResizedSignal;
@@ -292,11 +248,6 @@ Dali::WindowContainer Adaptor::GetWindows() const
   return mImpl->GetWindows();
 }
 
-Dali::SceneHolderList Adaptor::GetSceneHolders() const
-{
-  return mImpl->GetSceneHolders();
-}
-
 Any Adaptor::GetNativeWindowHandle()
 {
   Any window;

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 bfc1315b9e9aa22b3be142a67b4067ac41886cdd..953db2c20e4c77273ad0343c5d2a6c53f24ea77c 100644 (file)
--- 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
@@ -15,133 +15,36 @@
  *
  */
 
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/adaptors/scene-holder.h>
 
-#include <toolkit-scene-holder-impl.h>
-
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/base-object.h>
 
-#include <dali/integration-api/adaptors/adaptor.h>
-#include <toolkit-adaptor-impl.h>
-
-using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
-
 namespace Dali
 {
 
-///////////////////////////////////////////////////////////////////////////////
-//
-// Dali::Internal::Adaptor::SceneHolder Stub
-//
-///////////////////////////////////////////////////////////////////////////////
-
 namespace Internal
 {
 
 namespace Adaptor
 {
 
-SceneHolder::SceneHolder( const Dali::Rect<int>& positionSize )
-: mRenderSurface( positionSize ),
-  mScene( Dali::Integration::Scene::New( mRenderSurface ) )
-{
-}
-
-SceneHolder::~SceneHolder()
-{
-  if ( Dali::Adaptor::IsAvailable() )
-  {
-    AdaptorImpl::GetImpl( AdaptorImpl::Get() ).RemoveWindow( this );
-  }
-}
-
-void SceneHolder::Add( Dali::Actor actor )
-{
-  mScene.Add( actor );
-}
-
-void SceneHolder::Remove( Dali::Actor actor )
-{
-  mScene.Remove( actor );
-}
-
-Dali::Layer SceneHolder::GetRootLayer() const
+class SceneHolder: public Dali::BaseObject
 {
-  return mScene.GetRootLayer();
-}
 
-void SceneHolder::SetBackgroundColor( Vector4 color )
-{
-  return mScene.SetBackgroundColor( color );
-}
-
-Vector4 SceneHolder::GetBackgroundColor() const
-{
-  return mScene.GetBackgroundColor();
-}
+};
 
-void SceneHolder::FeedTouchPoint( Dali::TouchPoint& point, int timeStamp )
-{
-}
+} // Adaptor
 
-void SceneHolder::FeedWheelEvent( Dali::WheelEvent& wheelEvent )
-{
-}
-
-void SceneHolder::FeedKeyEvent( Dali::KeyEvent& keyEvent )
-{
-}
-
-Dali::Integration::SceneHolder::KeyEventSignalType& SceneHolder::KeyEventSignal()
-{
-  return mScene.KeyEventSignal();
-}
-
-Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
-{
-  return mScene.KeyEventGeneratedSignal();
-}
-
-Dali::Integration::SceneHolder::TouchSignalType& SceneHolder::TouchSignal()
-{
-  return mScene.TouchSignal();
-}
-
-Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
-{
-  return mScene.WheelEventSignal();
-}
-
-Integration::Scene SceneHolder::GetScene()
-{
-  return mScene;
-}
-
-Integration::RenderSurface& SceneHolder::GetRenderSurface()
-{
-  return mRenderSurface;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Dali::Integration::SceneHolder Stub
-//
-///////////////////////////////////////////////////////////////////////////////
+} // Internal
 
 namespace Integration
 {
 
 SceneHolder::SceneHolder()
 {
-  // Dali::Internal::Adaptor::Adaptor::Get().WindowCreatedSignal().Emit( *this );
 }
 
 SceneHolder::~SceneHolder()
@@ -186,54 +89,30 @@ void SceneHolder::Remove( Actor actor )
   GetImplementation( *this ).Remove( actor );
 }
 
-Dali::Layer SceneHolder::GetRootLayer() const
+Layer SceneHolder::GetRootLayer() const
 {
   return GetImplementation( *this ).GetRootLayer();
 }
 
 void SceneHolder::SetBackgroundColor( Vector4 color )
 {
-  GetImplementation( *this ).SetBackgroundColor( color );
 }
 
 Vector4 SceneHolder::GetBackgroundColor() const
 {
-  return GetImplementation( *this ).GetBackgroundColor();
+  return Dali::Stage::GetCurrent().GetBackgroundColor();
 }
 
 void SceneHolder::FeedTouchPoint( Dali::TouchPoint& point, int timeStamp )
 {
-  GetImplementation( *this ).FeedTouchPoint( point, timeStamp );
 }
 
 void SceneHolder::FeedWheelEvent( Dali::WheelEvent& wheelEvent )
 {
-  GetImplementation( *this ).FeedWheelEvent( wheelEvent );
 }
 
 void SceneHolder::FeedKeyEvent( Dali::KeyEvent& keyEvent )
 {
-  GetImplementation( *this ).FeedKeyEvent( keyEvent );
-}
-
-SceneHolder::KeyEventSignalType& SceneHolder::KeyEventSignal()
-{
-  return GetImplementation( *this ).KeyEventSignal();
-}
-
-SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
-{
-  return GetImplementation( *this ).KeyEventGeneratedSignal();
-}
-
-SceneHolder::TouchSignalType& SceneHolder::TouchSignal()
-{
-  return GetImplementation( *this ).TouchSignal();
-}
-
-SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
-{
-  return GetImplementation( *this ).WheelEventSignal();
 }
 
 } // Integration

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 9849f60e4933a0df4d6fb125f749657cac8674d9..3620bf9a3d610ca9442f411bb7674abea21775ea 100644 (file)
--- 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
@@ -46,16 +46,26 @@ namespace Internal
 {
 namespace Adaptor
 {
-
-Window::Window( const PositionSize& positionSize )
-: SceneHolder( positionSize )
+class Window : public Dali::BaseObject
 {
-}
+public:
 
-Window* Window::New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent)
-{
-  return new Window( positionSize );
-}
+  Window( const PositionSize& positionSize )
+  : mRenderSurface( positionSize ),
+    mScene( Dali::Integration::Scene::New( mRenderSurface ) )
+  {
+  }
+
+  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;
+};
 
 } // Adaptor
 } // Internal
@@ -101,13 +111,10 @@ Dali::Window Window::New( PositionSize windowPosition, const std::string& name,
 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 result( window );
-
-  // This will also emit the window created signals
-  AdaptorImpl::GetImpl( AdaptorImpl::Get() ).AddWindow( window );
-
-  return result;
+  Dali::Window newWindow = Window( window );
+  Dali::Adaptor::WindowCreatedSignalType& windowCreatedSignal = AdaptorImpl::Get().WindowCreatedSignal();
+  windowCreatedSignal.Emit( newWindow );
+  return Window( window );
 }
 
 Window::Window( Internal::Adaptor::Window* window )
@@ -117,12 +124,12 @@ Window::Window( Internal::Adaptor::Window* window )
 
 Integration::Scene Window::GetScene()
 {
-  return GetImplementation( *this ).GetScene();
+  return GetImplementation( *this ).mScene;
 }
 
 Integration::RenderSurface& Window::GetRenderSurface()
 {
-  return GetImplementation( *this ).GetRenderSurface();
+  return GetImplementation( *this ).mRenderSurface;
 }
 
 void Window::Add( Actor actor )
@@ -187,27 +194,27 @@ Window DownCast( BaseHandle handle )
 
 EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window )
 {
-  return GetImplementation( window ).GetScene().EventProcessingFinishedSignal();
+  return GetImplementation( window ).mScene.EventProcessingFinishedSignal();
 }
 
 KeyEventSignalType& KeyEventSignal( Window window )
 {
-  return GetImplementation( window ).KeyEventSignal();
+  return GetImplementation( window ).mScene.KeyEventSignal();
 }
 
 KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
 {
-  return GetImplementation( window ).KeyEventGeneratedSignal();
+  return GetImplementation( window ).mScene.KeyEventGeneratedSignal();
 }
 
 TouchSignalType& TouchSignal( Window window )
 {
-  return GetImplementation( window ).TouchSignal();
+  return GetImplementation( window ).mScene.TouchSignal();
 }
 
 WheelEventSignalType& WheelEventSignal( Window window )
 {
-  return GetImplementation( window ).WheelEventSignal();
+  return GetImplementation( window ).mScene.WheelEventSignal();
 }
 
 } // namespace DevelWindow

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 61cb48190982a0327c7acb8fa14298262354b517..761f60cfa9e404ce4100b25a73a4f5785a572578 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -22,6 +22,7 @@
 #include <cstring> // for strcmp
 #include <dali/public-api/actors/layer.h>
 #include <dali/devel-api/adaptor-framework/singleton-service.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/devel-api/adaptor-framework/lifecycle-controller.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/common/stage.h>
@@ -141,33 +142,23 @@ void KeyboardFocusManager::OnAdaptorInit()
 {
   if( Adaptor::IsAvailable() )
   {
-    // Retrieve all the existing scene holders
-    Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders();
-    for( auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter )
+    // Retrieve all the existing widnows
+    Dali::WindowContainer windows = Adaptor::Get().GetWindows();
+    for ( auto iter = windows.begin(); iter != windows.end(); ++iter )
     {
-      ( *iter ).KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent );
-      ( *iter ).TouchSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch );
-      Dali::Window window = DevelWindow::DownCast( *iter );
-      if( window )
-      {
-        window.FocusChangeSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged);
-      }
+      DevelWindow::KeyEventSignal( *iter ).Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent);
+      DevelWindow::TouchSignal( *iter ).Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch);
     }
 
-    // Get notified when any new scene holder is created afterwards
-    Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnSceneHolderCreated );
+    // Get notified when any new window is created afterwards
+    Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnWindowCreated);
   }
 }
 
-void KeyboardFocusManager::OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder )
+void KeyboardFocusManager::OnWindowCreated( Dali::Window& window )
 {
-  sceneHolder.KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent );
-  sceneHolder.TouchSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch );
-  Dali::Window window = DevelWindow::DownCast( sceneHolder );
-  if( window )
-  {
-    window.FocusChangeSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged);
-  }
+  DevelWindow::KeyEventSignal( window ).Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent);
+  DevelWindow::TouchSignal( window ).Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch);
 }
 
 KeyboardFocusManager::~KeyboardFocusManager()

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
index 176bfce78ed904f87ff27d0e47a114ba5a8cc770..caa0ca9b83997bafbcc114e6d6fe93207be0f877 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@ -31,12 +31,7 @@
 namespace Dali
 {
 
-namespace Integration
-{
-
-class SceneHolder;
-
-} // namespace Integration
+class Window;
 
 namespace Toolkit
 {
@@ -208,10 +203,10 @@ private:
   void OnAdaptorInit();
 
   /**
-   * This will be called when a new scene holder is created
-   * @param sceneHolder The new scene holder
+   * This will be called when a new wndow is created
+   * @param window The new window
    */
-  void OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder );
+  void OnWindowCreated( Dali::Window& window );
 
   /**
    * Get configuration from StyleManager.

diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index 57e0d8636c16f21fd7504a96d064e0673f37dbfa..71bc3528668849301713089d3179247a82bddaa4 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -23,8 +23,8 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/devel-api/common/stage-devel.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/integration-api/adaptors/adaptor.h>
-#include <dali/integration-api/adaptors/scene-holder.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -53,23 +53,23 @@ KeyInputFocusManager::KeyInputFocusManager()
   mCurrentFocusControl()
 {
   // Retrieve all the existing widnows
-  Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders();
-  for( auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter )
+  Dali::WindowContainer windows = Adaptor::Get().GetWindows();
+  for ( auto iter = windows.begin(); iter != windows.end(); ++iter )
   {
-    ( *iter ).KeyEventGeneratedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent );
+    DevelWindow::KeyEventGeneratedSignal( *iter ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
   }
 
-  // Get notified when any new scene holder is created afterwards
-  Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnSceneHolderCreated );
+  // Get notified when any new window is created afterwards
+  Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnWindowCreated);
 }
 
 KeyInputFocusManager::~KeyInputFocusManager()
 {
 }
 
-void KeyInputFocusManager::OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder )
+void KeyInputFocusManager::OnWindowCreated( Dali::Window& window )
 {
-  sceneHolder.KeyEventGeneratedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent );
+  DevelWindow::KeyEventGeneratedSignal( window ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
 }
 
 void KeyInputFocusManager::SetFocus( Toolkit::Control control )

diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
index ab83e37a49e3251f725aadd3e8b3f672bd8f0ded..0f066c5b7e2eefe634e3c6cbb84b653bbaa99474 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
@@ -30,12 +30,7 @@
 namespace Dali
 {
 
-namespace Integration
-{
-
-class SceneHolder;
-
-} // namespace Integration
+class Window;
 
 namespace Toolkit
 {
@@ -98,10 +93,10 @@ protected:
 
 private:
   /**
-   * This will be called when a new scene holder is created
-   * @param sceneHolder The new scene holder
+   * This will be called when a new window is created
+   * @param window The new window
    */
-  void OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder );
+  void OnWindowCreated( Dali::Window& window );
 
   /**
    * Callback for the key event when no actor in the stage has gained the key input focus