From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 29 Jul 2019 05:48:51 +0000 (+0900)
Subject: Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally"
X-Git-Tag: accepted/tizen/unified/20190730.112019~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=bf6fc85100d083e6b80714eb4d4269d661580396

Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally"

This reverts commit a46c155d73b730a6ebcd5e59d432d2533f84c284.

Change-Id: I856e7e080dcc4ec0845f5eef19513dcf9600da51
---

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index e3401d5..5860a3a 100644
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -164,11 +164,6 @@ Scene::KeyEventSignalType& Scene::KeyEventSignal()
   return GetImplementation(*this).KeyEventSignal();
 }
 
-Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
-{
-  return GetImplementation(*this).KeyEventGeneratedSignal();
-}
-
 Scene::TouchSignalType& Scene::TouchSignal()
 {
   return GetImplementation(*this).TouchSignal();
diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h
index ec26df6..dcc95b3 100755
--- a/dali/integration-api/scene.h
+++ b/dali/integration-api/scene.h
@@ -55,7 +55,6 @@ class DALI_CORE_API Scene : public BaseHandle
 public:
   typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type
   typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type
-  typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< key event generated signal type
   typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type
   typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
 
@@ -255,13 +254,6 @@ public:
   KeyEventSignalType& KeyEventSignal();
 
   /**
-   * @brief The user would connect to this signal to get a KeyEvent when KeyEvent is generated.
-   *
-   * @return The return is true if KeyEvent is consumed, otherwise false.
-   */
-  KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
-  /**
    * @brief This signal is emitted when the screen is touched and when the touch ends
    * (i.e. the down & up touch events only).
    *
diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp
index 4b53d79..19be8cc 100644
--- a/dali/internal/event/common/scene-impl.cpp
+++ b/dali/internal/event/common/scene-impl.cpp
@@ -325,12 +325,6 @@ void Scene::EmitKeyEventSignal(const KeyEvent& event)
   }
 }
 
-bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event)
-{
-  // Emit the KeyEventGenerated signal when KeyEvent is generated
-  return mKeyEventGeneratedSignal.Emit( event );
-}
-
 void Scene::EmitEventProcessingFinishedSignal()
 {
   if ( !mEventProcessingFinishedSignal.Empty() )
@@ -367,11 +361,6 @@ Integration::Scene::KeyEventSignalType& Scene::KeyEventSignal()
   return mKeyEventSignal;
 }
 
-Integration::Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
-{
-  return mKeyEventGeneratedSignal;
-}
-
 Integration::Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal()
 {
   return mEventProcessingFinishedSignal;
diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index c524d62..6671fa3 100644
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -187,13 +187,6 @@ public:
   void EmitKeyEventSignal(const KeyEvent& event);
 
   /**
-   * Used by the KeyEventProcessor to emit KeyEventGenerated signals.
-   * @param[in] event The key event.
-   * @return The return is true if KeyEvent is consumed, otherwise false.
-   */
-  bool EmitKeyEventGeneratedSignal(const KeyEvent& event);
-
-  /**
    * Emits the event processing finished signal.
    *
    * @see Dali::Scene::SignalEventProcessingFinished()
@@ -218,11 +211,6 @@ public:
    */
   Integration::Scene::KeyEventSignalType& KeyEventSignal();
 
-    /**
-   * @copydoc Integration::Scene::KeyEventGeneratedSignal()
-   */
-  Integration::Scene::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
   /**
    * @copydoc Integration::Scene::SignalEventProcessingFinished()
    */
@@ -306,7 +294,6 @@ private:
 
   // The key event signal
   Integration::Scene::KeyEventSignalType mKeyEventSignal;
-  Integration::Scene::KeyEventGeneratedSignalType   mKeyEventGeneratedSignal;
 
   // The event processing finished signal
   Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal;
diff --git a/dali/internal/event/events/key-event-processor.cpp b/dali/internal/event/events/key-event-processor.cpp
index 3d9ef47..399c209 100755
--- a/dali/internal/event/events/key-event-processor.cpp
+++ b/dali/internal/event/events/key-event-processor.cpp
@@ -25,7 +25,6 @@
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
-
 namespace Dali
 {
 
@@ -51,12 +50,7 @@ void KeyEventProcessor::ProcessKeyEvent( const Integration::KeyEvent& event )
   GetImplementation( &keyEvent )->SetDeviceSubclass( event.deviceSubclass );
 
   // Emit the key event signal from the scene.
-  bool consumed = mScene.EmitKeyEventGeneratedSignal( keyEvent );
-  if( !consumed )
-  {
-    mScene.EmitKeyEventSignal(keyEvent);
-  }
-
+  mScene.EmitKeyEventSignal( keyEvent );
 }
 
 } // namespace Internal