[Tizen] Add screen and client rotation itself function

[platform/core/uifw/dali-core.git] / dali / internal / event / common / scene-impl.h

diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index 021cd2e..c84d4c6 100755 (executable)
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -117,9 +117,14 @@ public:
   static ScenePtr New( Size size );
 
   /**
+   * @copydoc Dali::Integration::Scene::New
+   */
+  static ScenePtr New( Size size, int orientation );
+
+  /**
    * virtual destructor
    */
-  virtual ~Scene();
+  ~Scene() override;
 
   /**
    * @copydoc Dali::Integration::Scene::Add
@@ -237,14 +242,14 @@ public:
    * Used by the EventProcessor to emit key event signals.
    * @param[in] event The key event.
    */
-  void EmitKeyEventSignal(const KeyEvent& event);
+  void EmitKeyEventSignal(const Dali::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);
+  bool EmitKeyEventGeneratedSignal(const Dali::KeyEvent& event);
 
   /**
    * Emits the event processing finished signal.
@@ -255,16 +260,15 @@ public:
 
   /**
    * Emits the touched signal.
-   * @param[in] touchEvent The touch event details (Old API).
    * @param[in] touch The touch event details.
    */
-  void EmitTouchedSignal( const TouchEvent& touchEvent, const Dali::TouchData& touch );
+  void EmitTouchedSignal( const Dali::TouchEvent& touch );
 
   /**
    * Used by the EventProcessor to emit wheel event signals.
    * @param[in] event The wheel event.
    */
-  void EmitWheelEventSignal( const WheelEvent& event );
+  void EmitWheelEventSignal( const Dali::WheelEvent& event );
 
   /**
    * @copydoc Dali::Integration::Scene::AddFrameRenderedCallback
@@ -301,18 +305,10 @@ public:
    */
   Integration::Scene::EventProcessingFinishedSignalType& EventProcessingFinishedSignal();
 
-  // The touched signal, to support Stage touched signal, will be removed when deprecated in public Stage API
-  using TouchedSignalType = Signal< void (const TouchEvent&) >;
-
   /**
-   * Touched signal to support deprecated stage touched signal.
-   */
-  TouchedSignalType& TouchedSignal();
-
-  /**
-    * @copydoc Integration::Scene::TouchSignal()
+    * @copydoc Integration::Scene::TouchedSignal()
     */
-  Integration::Scene::TouchSignalType& TouchSignal();
+  Integration::Scene::TouchEventSignalType& TouchedSignal();
 
   /**
    * @copydoc Integration::Scene::sWheelEventSignal()
@@ -332,13 +328,13 @@ public:
    * From RenderTaskDefaults; retrieve the default root actor.
    * @return The default root actor.
    */
-  virtual Actor& GetDefaultRootActor();
+  Actor& GetDefaultRootActor() override;
 
   /**
    * From RenderTaskDefaults; retrieve the default camera actor.
    * @return The default camera actor.
    */
-  virtual CameraActor& GetDefaultCameraActor();
+  CameraActor& GetDefaultCameraActor() override;
 
 private:
 
@@ -349,8 +345,9 @@ private:
    * Second-phase constructor.
    *
    * @param[in] size The size of the set surface
+   * @param[in] orientation The orientation of the set surface for this scene
    */
-  void Initialize( Size size );
+  void Initialize( Size size, int orientation );
 
   // Undefined
   Scene(const Scene&) = delete;
@@ -392,10 +389,7 @@ private:
   Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal;
 
   // The touch signal
-  Integration::Scene::TouchSignalType mTouchSignal;
-
-  // The touched signal
-  TouchedSignalType mTouchedSignal;
+  Integration::Scene::TouchEventSignalType mTouchedSignal;
 
   // The wheel event signal
   Integration::Scene::WheelEventSignalType mWheelEventSignal;