Change a service name of the indicator and remove a unused indicator style

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

diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h
index 428244c..242b213 100644 (file)
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -21,20 +21,20 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
-#include <window.h>
-#include <orientation.h>
-#include <render-surface.h>
-#include <drag-and-drop-detector.h>
 
 // INTERNAL INCLUDES
 #include <base/lifecycle-observer.h>
 #include <adaptor-impl.h>
 #include <indicator-impl.h>
-
+#include <window.h>
+#include <orientation.h>
+#include <render-surface.h>
+#include <drag-and-drop-detector.h>
 
 namespace Dali
 {
 class Adaptor;
+class RenderSurface;
 
 namespace Integration
 {
@@ -45,7 +45,6 @@ namespace Internal
 {
 namespace Adaptor
 {
-class RenderSurface;
 class Indicator;
 class Orientation;
 
@@ -59,6 +58,8 @@ typedef IntrusivePtr<Orientation> OrientationPtr;
 class Window : public Dali::BaseObject, public Indicator::Observer, public LifeCycleObserver
 {
 public:
+  typedef Dali::Window::IndicatorSignalType IndicatorSignalType;
+
   /**
    * Create a new Window. This should only be called once by the Application class
    * @param[in] windowPosition The position and size of the window
@@ -81,16 +82,6 @@ public:
   RenderSurface* GetSurface();
 
   /**
-   * @copydoc Dali::Window::SetIndicatorStyle()
-   */
-  void SetIndicatorStyle( Dali::Window::IndicatorStyle style );
-
-  /**
-   * @copydoc Dali::Window::ShowIndicator()
-   */
-  void ShowIndicator( bool show );
-
-  /**
    * @copydoc Dali::Window::ShowIndicator()
    */
   void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode );
@@ -166,11 +157,15 @@ public:
   Dali::DragAndDropDetector GetDragAndDropDetector() const;
 
   /**
+   * @copydoc Dali::Window::GetNativeHandle() const
+   */
+  Dali::Any GetNativeHandle() const;
+
+  /**
    * Called from Orientation after the Change signal has been sent
    */
   void RotationDone( int orientation, int width, int height );
 
-
 private:
   /**
    * Private constructor.
@@ -222,6 +217,11 @@ private: // Indicator::Observer interface
    */
   virtual void IndicatorClosed(Indicator* indicator);
 
+  /**
+   * @copydoc Dali::Internal::Adaptor::Indicator::Observer::IndicatorVisibilityChanged()
+   */
+  virtual void IndicatorVisibilityChanged( bool isVisible );
+
 private: // Adaptor::Observer interface
 
   /**
@@ -249,12 +249,17 @@ private: // Adaptor::Observer interface
    */
   virtual void OnDestroy();
 
+public: // Signals
+  /**
+   * The user should connect to this signal to get a timing when indicator was shown / hidden.
+   */
+  IndicatorSignalType& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignal; }
+
 private:
 
   typedef std::vector<Indicator*> DiscardedIndicators;
 
   RenderSurface*                   mSurface;
-  Dali::Window::IndicatorStyle     mIndicatorStyle;     ///< indicator style
   Dali::Window::IndicatorVisibleMode mIndicatorVisible; ///< public state
   bool                             mIndicatorIsShown:1; ///< private state
   bool                             mShowRotatedIndicatorOnClose:1;
@@ -275,6 +280,9 @@ private:
   OrientationPtr                               mOrientation;
   std::vector<Dali::Window::WindowOrientation> mAvailableOrientations;
   Dali::Window::WindowOrientation              mPreferredOrientation;
+
+  // Signals
+  IndicatorSignalType mIndicatorVisibilityChangedSignal;
 };
 
 } // namespace Adaptor