Revert "[Tizen] Connect KeyEventGeneratedSignal for Get KeyEvent"

This reverts commit c6ba4a0f978b422f611d901eefec3376c72219d5.

Change-Id: I993fc22a7b5d5ed08bd2287880336f40a940a942

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 d9e9cd808d6e4a319a0aeb3cf5f5644012fb347e..05c48364fed786dc3f822429ccad09f56f7324ad 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
@@ -20,7 +20,6 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/devel-api/common/stage-devel.h>
 
 // INTERNAL INCLUDES
 #include "toolkit-window.h"
@@ -108,11 +107,6 @@ KeyEventSignalType& KeyEventSignal( Window window )
   return Dali::Stage::GetCurrent().KeyEventSignal();
 }
 
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
-{
-  return DevelStage::KeyEventGeneratedSignal( Dali::Stage::GetCurrent() );
-}
-
 TouchSignalType& TouchSignal( Window window )
 {
   return Dali::Stage::GetCurrent().TouchSignal();

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index 37361dd45ffd9be6a02fdca35087d67a7254c4ec..4c95ad74b8726d98d7ddbffc55dc12ddeccd3199 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -62,12 +62,10 @@ namespace DevelWindow
 {
 
 typedef Signal< void (const KeyEvent&) > KeyEventSignalType;
-typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType;
 typedef Signal< void (const TouchData&) > TouchSignalType;
 
 Dali::Window Get( Actor actor );
 KeyEventSignalType& KeyEventSignal( Dali::Window window );
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
 TouchSignalType& TouchSignal( Dali::Window window );
 
 }

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 71bc3528668849301713089d3179247a82bddaa4..f188281f955e39232271d3390b2d47d1927443f4 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,6 @@
 #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>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -52,26 +50,13 @@ KeyInputFocusManager::KeyInputFocusManager()
 : mSlotDelegate( this ),
   mCurrentFocusControl()
 {
-  // Retrieve all the existing widnows
-  Dali::WindowContainer windows = Adaptor::Get().GetWindows();
-  for ( auto iter = windows.begin(); iter != windows.end(); ++iter )
-  {
-    DevelWindow::KeyEventGeneratedSignal( *iter ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
-  }
-
-  // Get notified when any new window is created afterwards
-  Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnWindowCreated);
+  DevelStage::KeyEventGeneratedSignal( Stage::GetCurrent() ).Connect(mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
 }
 
 KeyInputFocusManager::~KeyInputFocusManager()
 {
 }
 
-void KeyInputFocusManager::OnWindowCreated( Dali::Window& window )
-{
-  DevelWindow::KeyEventGeneratedSignal( window ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
-}
-
 void KeyInputFocusManager::SetFocus( Toolkit::Control control )
 {
   if( !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 0f066c5b7e2eefe634e3c6cbb84b653bbaa99474..f7886c2fb915aba2eee0e8c5d45fc75580600e86 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,8 +30,6 @@
 namespace Dali
 {
 
-class Window;
-
 namespace Toolkit
 {
 
@@ -92,11 +90,6 @@ protected:
   virtual ~KeyInputFocusManager();
 
 private:
-  /**
-   * This will be called when a new window is created
-   * @param window The new window
-   */
-  void OnWindowCreated( Dali::Window& window );
 
   /**
    * Callback for the key event when no actor in the stage has gained the key input focus