X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fcommon%2Fwindow-impl.h;h=09a75411341b505219346695660293fbf6bbcfe6;hb=8bd596182e33bae78a8acd44754c3df6ee14700c;hp=13a2349dd05ca11e48859ecbea7096f677795726;hpb=15137bb2a4d50455579aadd3b9fb1874577c0a1a;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h
old mode 100755
new mode 100644
index 13a2349..09a7541
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -160,37 +160,121 @@ public:
   Dali::Any GetNativeHandle() const;
 
   /**
-   * @brief Sets whether window accepts focus or not.
-   *
-   * @param[in] accept If focus is accepted or not. Default is true.
+   * @copydoc Dali::DevelWindow::SetAcceptFocus()
    */
   void SetAcceptFocus( bool accept );
 
   /**
-   * @brief Returns whether window accepts focus or not.
-   *
-   * @param[in] window The window to accept focus
-   * @return True if the window accept focus, false otherwise
+   * @copydoc Dali::DevelWindow::IsFocusAcceptable()
    */
   bool IsFocusAcceptable();
 
   /**
-   * @brief Shows the window if it is hidden.
+   * @copydoc Dali::DevelWindow::Show()
    */
   void Show();
 
   /**
-   * @brief Hides the window if it is showing.
+   * @copydoc Dali::DevelWindow::Hide()
    */
   void Hide();
 
   /**
-   * @brief Returns whether the window is showing or not.
-   * @return True if the window is showing, false otherwise.
+   * @copydoc Dali::DevelWindow::IsVisible() const
    */
   bool IsVisible() const;
 
   /**
+   * @copydoc Dali::DevelWindow::GetSupportedAuxiliaryHintCount()
+   */
+   unsigned int GetSupportedAuxiliaryHintCount();
+
+   /**
+    * @copydoc Dali::DevelWindow::GetSupportedAuxiliaryHint()
+    */
+  std::string GetSupportedAuxiliaryHint( unsigned int index );
+
+  /**
+   * @copydoc Dali::DevelWindow::AddAuxiliaryHint()
+   */
+  unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value );
+
+  /**
+   * @copydoc Dali::DevelWindow::RemoveAuxiliaryHint()
+   */
+  bool RemoveAuxiliaryHint( unsigned int id );
+
+  /**
+   * @copydoc Dali::DevelWindow::SetAuxiliaryHintValue()
+   */
+  bool SetAuxiliaryHintValue( unsigned int id, const std::string& value );
+
+  /**
+   * @copydoc Dali::DevelWindow::GetAuxiliaryHintValue()
+   */
+  std::string GetAuxiliaryHintValue( unsigned int id ) const;
+
+  /**
+   * @copydoc Dali::DevelWindow::GetAuxiliaryHintId()
+   */
+  unsigned int GetAuxiliaryHintId( const std::string& hint ) const;
+
+  /**
+   * @copydoc Dali::DevelWindow::SetInputRegion()
+   */
+  void SetInputRegion( const Rect< int >& inputRegion );
+
+  /**
+   * @copydoc Dali::DevelWindow::SetType()
+   */
+  void SetType( Dali::DevelWindow::Type type );
+
+  /**
+   * @copydoc Dali::DevelWindow::GetType() const
+   */
+  Dali::DevelWindow::Type GetType() const;
+
+  /**
+   * @copydoc Dali::DevelWindow::SetNotificationLevel()
+   */
+  bool SetNotificationLevel( Dali::DevelWindow::NotificationLevel::Type level );
+
+  /**
+   * @copydoc Dali::DevelWindow::GetNotificationLevel()
+   */
+  Dali::DevelWindow::NotificationLevel::Type GetNotificationLevel();
+
+  /**
+   * @copydoc Dali::DevelWindow::SetOpaqueState()
+   */
+  void SetOpaqueState( bool opaque );
+
+  /**
+   * @copydoc Dali::DevelWindow::IsOpaqueState()
+   */
+  bool IsOpaqueState();
+
+  /**
+   * @copydoc Dali::DevelWindow::SetScreenMode()
+   */
+  bool SetScreenMode( Dali::DevelWindow::ScreenMode::Type screenMode );
+
+  /**
+   * @copydoc Dali::DevelWindow::GetScreenMode()
+   */
+  Dali::DevelWindow::ScreenMode::Type GetScreenMode();
+
+  /**
+   * @copydoc Dali::DevelWindow::SetBrightness()
+   */
+  bool SetBrightness( int brightness );
+
+  /**
+   * @copydoc Dali::DevelWindow::GetBrightness()
+   */
+  int GetBrightness();
+
+  /**
    * Called from Orientation after the Change signal has been sent
    */
   void RotationDone( int orientation, int width, int height );
@@ -297,7 +381,7 @@ public: // Signals
 
 private:
 
-  typedef std::vector< IndicatorInterface * > DiscardedIndicators;
+  typedef std::vector< std::pair< std::string, std::string > > AuxiliaryHints;
 
   RenderSurface*                   mSurface;
   Dali::Window::IndicatorVisibleMode mIndicatorVisible; ///< public state
@@ -309,6 +393,7 @@ private:
   bool                             mEcoreEventHander:1;
   bool                             mIsFocusAcceptable:1;
   bool                             mVisible:1;
+  bool                             mOpaqueState:1;
   IndicatorInterface*              mIndicator;
   Dali::Window::WindowOrientation  mIndicatorOrientation;
   Dali::Window::WindowOrientation  mNextIndicatorOrientation;
@@ -316,6 +401,7 @@ private:
   Integration::SystemOverlay*      mOverlay;
   Adaptor*                         mAdaptor;
   Dali::DragAndDropDetector        mDragAndDropDetector;
+  Dali::DevelWindow::Type          mType;
 
   struct EventHandler;
   EventHandler*                    mEventHandler;
@@ -324,14 +410,13 @@ private:
   std::vector<Dali::Window::WindowOrientation> mAvailableOrientations;
   Dali::Window::WindowOrientation              mPreferredOrientation;
 
+  std::vector< std::string >        mSupportedAuxiliaryHints;
+  AuxiliaryHints                    mAuxiliaryHints;
+
   // Signals
   IndicatorSignalType mIndicatorVisibilityChangedSignal;
   FocusSignalType     mFocusChangedSignal;
   SignalType          mDeleteRequestSignal;
-
-public:
-
-  void* GetNativeWindowHandler();
 };
 
 } // namespace Adaptor