X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyinput-focus-manager-impl.cpp;h=ad87ac3f07b13c6352570a83babc58608059c113;hb=7f472b6fa56d5382514b9abb9a4c71419189acff;hp=71bc3528668849301713089d3179247a82bddaa4;hpb=d7cef550d3627f3a161913ab1805a7faf0a15f36;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 71bc352..ad87ac3 100644
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,103 +19,95 @@
 #include "keyinput-focus-manager-impl.h"
 
 // EXTERNAL INCLUDES
-#include <cstring> // for strcmp
-#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>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/layer.h>
+#include <cstring> // for strcmp
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace
 {
-
 // Signals
 
 const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED = "keyInputFocusChanged";
 
-}
+} // namespace
 
 KeyInputFocusManager::KeyInputFocusManager()
-: mSlotDelegate( this ),
+: mSlotDelegate(this),
   mCurrentFocusControl()
 {
   // Retrieve all the existing widnows
-  Dali::WindowContainer windows = Adaptor::Get().GetWindows();
-  for ( auto iter = windows.begin(); iter != windows.end(); ++iter )
+  Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders();
+  for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
   {
-    DevelWindow::KeyEventGeneratedSignal( *iter ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
+    (*iter).KeyEventGeneratedSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
   }
 
-  // Get notified when any new window is created afterwards
-  Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnWindowCreated);
+  // Get notified when any new scene holder is created afterwards
+  Adaptor::Get().WindowCreatedSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnSceneHolderCreated);
 }
 
 KeyInputFocusManager::~KeyInputFocusManager()
 {
 }
 
-void KeyInputFocusManager::OnWindowCreated( Dali::Window& window )
+void KeyInputFocusManager::OnSceneHolderCreated(Dali::Integration::SceneHolder& sceneHolder)
 {
-  DevelWindow::KeyEventGeneratedSignal( window ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
+  sceneHolder.KeyEventGeneratedSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
 }
 
-void KeyInputFocusManager::SetFocus( Toolkit::Control control )
+void KeyInputFocusManager::SetFocus(Toolkit::Control control)
 {
-  if( !control )
+  if(!control)
   {
     // No-op
     return;
   }
 
-  if( control == mCurrentFocusControl )
+  if(control == mCurrentFocusControl)
   {
     // Control already has focus
     return;
   }
 
-  control.OffStageSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlStageDisconnection );
+  control.OffSceneSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnFocusControlSceneDisconnection);
 
   Dali::Toolkit::Control previousFocusControl = GetCurrentFocusControl();
-  if( previousFocusControl )
+  if(previousFocusControl)
   {
     // Notify the control that it has lost key input focus
-    GetImplementation( previousFocusControl ).OnKeyInputFocusLost();
+    GetImplementation(previousFocusControl).OnKeyInputFocusLost();
   }
 
   // Set control to currentFocusControl
   mCurrentFocusControl = control;
 
   // Tell the new actor that it has gained focus.
-  GetImplementation( control ).OnKeyInputFocusGained();
+  GetImplementation(control).OnKeyInputFocusGained();
 
   // Emit the signal to inform focus change to the application.
-  if ( !mKeyInputFocusChangedSignal.Empty() )
+  if(!mKeyInputFocusChangedSignal.Empty())
   {
-    mKeyInputFocusChangedSignal.Emit( control, previousFocusControl );
+    mKeyInputFocusChangedSignal.Emit(control, previousFocusControl);
   }
 }
 
-void KeyInputFocusManager::RemoveFocus( Toolkit::Control control )
+void KeyInputFocusManager::RemoveFocus(Toolkit::Control control)
 {
-  if( control == mCurrentFocusControl )
+  if(control == mCurrentFocusControl)
   {
-    control.OffStageSignal().Disconnect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlStageDisconnection );
+    control.OffSceneSignal().Disconnect(mSlotDelegate, &KeyInputFocusManager::OnFocusControlSceneDisconnection);
 
     // Notify the control that it has lost key input focus
-    GetImplementation( control ).OnKeyInputFocusLost();
+    GetImplementation(control).OnKeyInputFocusLost();
 
     mCurrentFocusControl.Reset();
   }
@@ -131,36 +123,36 @@ Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusMana
   return mKeyInputFocusChangedSignal;
 }
 
-bool KeyInputFocusManager::OnKeyEvent( const KeyEvent& event )
+bool KeyInputFocusManager::OnKeyEvent(const KeyEvent& event)
 {
   bool consumed = false;
 
   Toolkit::Control control = GetCurrentFocusControl();
-  if( control )
+  if(control)
   {
     // Notify the control about the key event
-    consumed = EmitKeyEventSignal( control, event );
+    consumed = EmitKeyEventSignal(control, event);
   }
 
   return consumed;
 }
 
-bool KeyInputFocusManager::EmitKeyEventSignal( Toolkit::Control control, const KeyEvent& event )
+bool KeyInputFocusManager::EmitKeyEventSignal(Toolkit::Control control, const KeyEvent& event)
 {
   bool consumed = false;
 
-  if( control )
+  if(control)
   {
-    consumed = GetImplementation( control ).EmitKeyEventSignal( event );
+    consumed = GetImplementation(control).EmitKeyEventSignal(event);
 
     // if control doesn't consume KeyEvent, give KeyEvent to its parent.
-    if( !consumed )
+    if(!consumed)
     {
-      Toolkit::Control parent = Toolkit::Control::DownCast( control.GetParent() );
+      Toolkit::Control parent = Toolkit::Control::DownCast(control.GetParent());
 
-      if( parent )
+      if(parent)
       {
-        consumed = EmitKeyEventSignal( parent, event );
+        consumed = EmitKeyEventSignal(parent, event);
       }
     }
   }
@@ -168,22 +160,21 @@ bool KeyInputFocusManager::EmitKeyEventSignal( Toolkit::Control control, const K
   return consumed;
 }
 
-void KeyInputFocusManager::OnFocusControlStageDisconnection( Dali::Actor actor )
+void KeyInputFocusManager::OnFocusControlSceneDisconnection(Dali::Actor actor)
 {
-  RemoveFocus( Dali::Toolkit::Control::DownCast( actor ) );
+  RemoveFocus(Dali::Toolkit::Control::DownCast(actor));
 }
 
-
-bool KeyInputFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+bool KeyInputFocusManager::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
 {
-  bool connected( true );
-  KeyInputFocusManager* manager = dynamic_cast<KeyInputFocusManager*>( object );
+  bool                  connected(true);
+  KeyInputFocusManager* manager = dynamic_cast<KeyInputFocusManager*>(object);
 
-  if( manager )
+  if(manager)
   {
-    if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_CHANGED ) )
+    if(0 == strcmp(signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_CHANGED))
     {
-      manager->KeyInputFocusChangedSignal().Connect( tracker, functor );
+      manager->KeyInputFocusChangedSignal().Connect(tracker, functor);
     }
     else
     {