Remove Constraints from Cluster,ToolBar,View & ImageView

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / internal / controls / tool-bar / tool-bar-impl.h

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 9843ae6..2b2fa6d 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -18,7 +18,8 @@
  *
  */
 
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -40,7 +41,7 @@ namespace Internal
  * ToolBar is a control to create a tool bar.
  * @see Dali::Toolkit::ToolBar for more details.
  */
-class ToolBar : public ControlImpl
+class ToolBar : public Control
 {
 public:
 
@@ -65,7 +66,7 @@ public:
    */
   void RemoveControl( Dali::Actor control );
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
@@ -76,7 +77,7 @@ private: // From ControlImpl
    * Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group).
    * @param child The control to be added.
    *
-   * @see Toolkit::ControlImpl::OnControlChildAdd()
+   * @see Control::OnControlChildAdd()
    */
   virtual void OnControlChildAdd(Actor& child);
 
@@ -87,6 +88,12 @@ private: // From ControlImpl
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 private:
   /**
    */
@@ -135,6 +142,8 @@ private:
   float              mRightRelativeSpace;       ///< Relative space between center and right groups of controls.
   float              mAccumulatedRelativeSpace; ///< Stores the total percentage space used by controls.
   bool               mInitializing;             ///< Allows the use of Actor's API to add controls.
+  Vector3            mToolBarSize;              ///< The size of tool bar
+  Actor              mBackground;               ///< The background of the tool bar
 
   std::map<Actor/*control*/,Toolkit::Alignment> mControls; ///< Stores a relationship between controls and their alignments used to place them inside the table view.
 };