Merge "Use existing callback ID for recurring callbacks" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / window-impl.h

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 5bc3bb9..e9f8063
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -24,6 +24,7 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
 #include <dali/public-api/object/property-array.h>
+#include <dali/public-api/adaptor-framework/window-enumerations.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/window.h>
@@ -58,7 +59,6 @@ using EventHandlerPtr = IntrusivePtr< EventHandler >;
 class Window : public Dali::Internal::Adaptor::SceneHolder, public EventHandler::Observer, public ConnectionTracker
 {
 public:
-  typedef Dali::Window::ResizedSignalType ResizedSignalType;
   typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType;
   typedef Dali::Window::ResizeSignalType ResizeSignalType;
   typedef Dali::DevelWindow::VisibilityChangedSignalType VisibilityChangedSignalType;
@@ -131,22 +131,22 @@ public:
   /**
    * @copydoc Dali::Window::AddAvailableOrientation()
    */
-  void AddAvailableOrientation(Dali::Window::WindowOrientation orientation);
+  void AddAvailableOrientation(WindowOrientation orientation);
 
   /**
    * @copydoc Dali::Window::RemoveAvailableOrientation()
    */
-  void RemoveAvailableOrientation(Dali::Window::WindowOrientation orientation);
+  void RemoveAvailableOrientation(WindowOrientation orientation);
 
   /**
    * @copydoc Dali::Window::SetPreferredOrientation()
    */
-  void SetPreferredOrientation(Dali::Window::WindowOrientation orientation);
+  void SetPreferredOrientation(WindowOrientation orientation);
 
   /**
    * @copydoc Dali::Window::GetPreferredOrientation()
    */
-  Dali::Window::WindowOrientation GetPreferredOrientation();
+  WindowOrientation GetPreferredOrientation();
 
   /**
    * @copydoc Dali::Window::SetAcceptFocus()
@@ -211,22 +211,22 @@ public:
   /**
    * @copydoc Dali::Window::SetType()
    */
-  void SetType( Dali::Window::Type type );
+  void SetType( WindowType type );
 
   /**
    * @copydoc Dali::Window::GetType() const
    */
-  Dali::Window::Type GetType() const;
+  WindowType GetType() const;
 
   /**
    * @copydoc Dali::Window::SetNotificationLevel()
    */
-  bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level );
+  bool SetNotificationLevel( WindowNotificationLevel level );
 
   /**
    * @copydoc Dali::Window::GetNotificationLevel()
    */
-  Dali::Window::NotificationLevel::Type GetNotificationLevel() const;
+  WindowNotificationLevel GetNotificationLevel() const;
 
   /**
    * @copydoc Dali::Window::SetOpaqueState()
@@ -241,12 +241,12 @@ public:
   /**
    * @copydoc Dali::Window::SetScreenOffMode()
    */
-  bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode);
+  bool SetScreenOffMode(WindowScreenOffMode screenOffMode);
 
   /**
    * @copydoc Dali::Window::GetScreenOffMode()
    */
-  Dali::Window::ScreenOffMode::Type GetScreenOffMode() const;
+  WindowScreenOffMode GetScreenOffMode() const;
 
   /**
    * @copydoc Dali::Window::SetBrightness()
@@ -336,17 +336,12 @@ public:
   /**
    * @copydoc Dali::DevelWindow::GetCurrentOrientation()
    */
-  Dali::Window::WindowOrientation GetCurrentOrientation() const;
+  WindowOrientation GetCurrentOrientation() const;
 
   /**
    * @copydoc Dali::DevelWindow::SetAvailableOrientations()
    */
-  void SetAvailableOrientations( const Dali::Vector<Dali::Window::WindowOrientation>& orientations );
-
-  /**
-   * @copydoc Dali::DevelWindow::SetDamagedAreas()
-   */
-  void SetDamagedAreas(std::vector<Dali::Rect<int>>& areas);
+  void SetAvailableOrientations( const Dali::Vector<WindowOrientation>& orientations );
 
 public: // Dali::Internal::Adaptor::SceneHolder
 
@@ -388,7 +383,7 @@ private:
   /**
    * Destructor
    */
-  virtual ~Window();
+  ~Window() override;
 
   /**
    * Second stage initialization
@@ -418,7 +413,7 @@ private:
   /**
    * Called when the window receives a Transition effect-start/end event.
    */
-  void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type );
+  void OnTransitionEffectEvent( WindowEffectState state, WindowEffectType type );
 
   /**
    * @brief Called when window receives a keyboard repeat event.
@@ -426,6 +421,11 @@ private:
   void OnKeyboardRepeatSettingsChanged();
 
   /**
+   * @brief Called when the window redraw is requested.
+   */
+  void OnWindowRedrawRequest();
+
+  /**
    * @brief Set available orientation to window base.
    */
   void SetAvailableAnlges( const std::vector< int >& angles );
@@ -433,17 +433,17 @@ private:
   /**
    * @brief Convert from window orientation to angle using OrientationMode.
    */
-  int ConvertToAngle( Dali::Window::WindowOrientation orientation );
+  int ConvertToAngle( WindowOrientation orientation );
 
   /**
    * @brief Convert from angle to window orientation using OrientationMode.
    */
-  Dali::Window::WindowOrientation ConvertToOrientation( int angle ) const;
+  WindowOrientation ConvertToOrientation( int angle ) const;
 
   /**
    * @brief Check available window orientation for Available orientation.
    */
-  bool IsOrientationAvailable( Dali::Window::WindowOrientation orientation ) const;
+  bool IsOrientationAvailable( WindowOrientation orientation ) const;
 
 private: // Dali::Internal::Adaptor::SceneHolder
 
@@ -500,10 +500,6 @@ public: // Signals
    * @copydoc Dali::Window::FocusChangeSignal()
    */
   FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; }
-  /**
-   * @copydoc Dali::Window::ResizedSignal()
-   */
-  ResizedSignalType& ResizedSignal() { return mResizedSignal; }
 
   /**
    * @copydoc Dali::Window::ResizedSignal()
@@ -546,7 +542,7 @@ private:
   bool                                  mIconified:1;
   bool                                  mOpaqueState:1;
   bool                                  mResizeEnabled:1;
-  Dali::Window::Type                    mType;
+  WindowType                            mType;
   Dali::Window                          mParentWindow;
 
   OrientationPtr                        mOrientation;
@@ -564,7 +560,6 @@ private:
   int                                   mNativeWindowId;          ///< The Native Window Id
 
   // Signals
-  ResizedSignalType                       mResizedSignal;
   SignalType                              mDeleteRequestSignal;
   FocusChangeSignalType                   mFocusChangeSignal;
   ResizeSignalType                        mResizeSignal;