Merge "fix deep copy of the vector." into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / event / common / stage-impl.cpp

diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp
index 54201e1..f05b3f5 100644 (file)
--- a/dali/internal/event/common/stage-impl.cpp
+++ b/dali/internal/event/common/stage-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -36,10 +36,11 @@
 #include <dali/internal/event/common/object-registry-impl.h>
 #include <dali/integration-api/platform-abstraction.h>
 #include <dali/public-api/common/constants.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
 #include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/common/constants.h>
 
 using Dali::Internal::SceneGraph::Node;
 
@@ -65,7 +66,6 @@ const char* const SIGNAL_KEY_EVENT =                 "keyEvent";
 const char* const SIGNAL_KEY_EVENT_GENERATED =       "keyEventGenerated";
 const char* const SIGNAL_EVENT_PROCESSING_FINISHED = "eventProcessingFinished";
 const char* const SIGNAL_TOUCHED =                   "touched";
-const char* const SIGNAL_TOUCH =                     "touch";
 const char* const SIGNAL_WHEEL_EVENT =               "wheelEvent";
 const char* const SIGNAL_CONTEXT_LOST =              "contextLost";
 const char* const SIGNAL_CONTEXT_REGAINED =          "contextRegained";
@@ -75,13 +75,12 @@ TypeRegistration mType( typeid(Dali::Stage), typeid(Dali::BaseHandle), NULL );
 
 SignalConnectorType signalConnector1( mType, SIGNAL_KEY_EVENT,                 &Stage::DoConnectSignal );
 SignalConnectorType signalConnector2( mType, SIGNAL_EVENT_PROCESSING_FINISHED, &Stage::DoConnectSignal );
-SignalConnectorType signalConnector3( mType, SIGNAL_TOUCHED,                   &Stage::DoConnectSignal );
 SignalConnectorType signalConnector4( mType, SIGNAL_WHEEL_EVENT,               &Stage::DoConnectSignal );
 SignalConnectorType signalConnector5( mType, SIGNAL_CONTEXT_LOST,              &Stage::DoConnectSignal );
 SignalConnectorType signalConnector6( mType, SIGNAL_CONTEXT_REGAINED,          &Stage::DoConnectSignal );
 SignalConnectorType signalConnector7( mType, SIGNAL_SCENE_CREATED,             &Stage::DoConnectSignal );
 SignalConnectorType signalConnector8( mType, SIGNAL_KEY_EVENT_GENERATED,       &Stage::DoConnectSignal );
-SignalConnectorType signalConnector9( mType, SIGNAL_TOUCH,                     &Stage::DoConnectSignal );
+SignalConnectorType signalConnector9( mType, SIGNAL_TOUCHED,                   &Stage::DoConnectSignal );
 
 } // unnamed namespace
 
@@ -93,7 +92,11 @@ StagePtr Stage::New( SceneGraph::UpdateManager& updateManager )
 void Stage::Initialize( Scene& scene )
 {
   mScene = &scene;
-  mScene->SetBackgroundColor( Dali::Stage::DEFAULT_BACKGROUND_COLOR );
+  mScene->SetBackgroundColor( Dali::DEFAULT_BACKGROUND_COLOR );
+  mScene->EventProcessingFinishedSignal().Connect( this, &Stage::OnEventProcessingFinished );
+  mScene->KeyEventSignal().Connect( this, &Stage::OnKeyEvent );
+  mScene->TouchedSignal().Connect( this, &Stage::OnTouchEvent );
+  mScene->WheelEventSignal().Connect( this, &Stage::OnWheelEvent );
 }
 
 StagePtr Stage::GetCurrent()
@@ -232,10 +235,6 @@ bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   {
     stage->TouchedSignal().Connect( tracker, functor );
   }
-  else if( 0 == strcmp( signalName.c_str(), SIGNAL_TOUCH ) )
-  {
-    stage->TouchSignal().Connect( tracker, functor );
-  }
   else if( 0 == strcmp( signalName.c_str(), SIGNAL_WHEEL_EVENT ) )
   {
     stage->WheelEventSignal().Connect( tracker, functor );
@@ -261,6 +260,30 @@ bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   return connected;
 }
 
+void Stage::OnEventProcessingFinished()
+{
+  EmitEventProcessingFinishedSignal();
+}
+
+void Stage::OnKeyEvent( const Dali::KeyEvent& event )
+{
+  bool consumed = EmitKeyEventGeneratedSignal( event );
+  if( !consumed )
+  {
+    EmitKeyEventSignal( event );
+  }
+}
+
+void Stage::OnTouchEvent( const Dali::TouchEvent& touch )
+{
+  EmitTouchedSignal( touch );
+}
+
+void Stage::OnWheelEvent( const Dali::WheelEvent& event )
+{
+  EmitWheelEventSignal( event );
+}
+
 void Stage::EmitKeyEventSignal(const KeyEvent& event)
 {
   // Emit the key event signal when no actor in the stage has gained the key input focus
@@ -277,16 +300,15 @@ bool Stage::EmitKeyEventGeneratedSignal(const KeyEvent& event)
 
 void Stage::EmitEventProcessingFinishedSignal()
 {
-   mEventProcessingFinishedSignal.Emit();
+  mEventProcessingFinishedSignal.Emit();
 }
 
-void Stage::EmitTouchedSignal( const TouchEvent& touchEvent, const Dali::TouchData& touch )
+void Stage::EmitTouchedSignal( const Dali::TouchEvent& touch )
 {
-  mTouchedSignal.Emit( touchEvent );
-  mTouchSignal.Emit( touch );
+  mTouchedSignal.Emit( touch );
 }
 
-void Stage::EmitWheelEventSignal(const WheelEvent& event)
+void Stage::EmitWheelEventSignal( const WheelEvent& event )
 {
   // Emit the wheel event signal when no actor in the stage has gained the wheel input focus
 
@@ -329,17 +351,11 @@ Dali::Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSi
   return mEventProcessingFinishedSignal;
 }
 
-Dali::Stage::TouchedSignalType& Stage::TouchedSignal()
+Dali::Stage::TouchEventSignalType& Stage::TouchedSignal()
 {
-  DALI_LOG_WARNING( "Deprecated. Use TouchSignal() instead.\n" );
   return mTouchedSignal;
 }
 
-Dali::Stage::TouchSignalType& Stage::TouchSignal()
-{
-  return mTouchSignal;
-}
-
 Dali::Stage::WheelEventSignalType& Stage::WheelEventSignal()
 {
   return mWheelEventSignal;
@@ -376,7 +392,6 @@ Stage::Stage( SceneGraph::UpdateManager& updateManager )
   mKeyEventGeneratedSignal(),
   mEventProcessingFinishedSignal(),
   mTouchedSignal(),
-  mTouchSignal(),
   mWheelEventSignal(),
   mContextLostSignal(),
   mContextRegainedSignal(),