Remove Constraints from Cluster,ToolBar,View & ImageView

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

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
index bd33da9..a7a30e0 100644 (file)
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
@@ -69,7 +69,7 @@ typedef ChildInfoContainer::const_iterator ChildInfoConstIter;
  * Multiple cluster styles may be provided, to determine the position, size, rotation, scale, color and visibility
  * of the child actors in the cluster.
  */
-class Cluster : public ControlImpl
+class Cluster : public Control
 {
 public:
 
@@ -231,9 +231,9 @@ private:
    */
   void DoTransformAction(const PropertyValueContainer& attributes);
 
-private: // From ControlImpl
+private: // From Control
   /**
-   * From Toolkit::ControlImpl; called shortly before a child is removed from the owning actor.
+   * From Control; called shortly before a child is removed from the owning actor.
    * @param[in] child The child being removed.Ptr
    */
   virtual void OnControlChildRemove(Actor& child);
@@ -247,15 +247,21 @@ public:
    * @param[in] attributes The attributes with which to perfrom this action.
    * @return true if action has been accepted by this control
    */
-  static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
+  static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes);
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
    */
   virtual void OnInitialize();
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 protected:
 
   /**
@@ -281,6 +287,7 @@ private:
 
   Toolkit::ClusterStyle mClusterStyle;
   ChildInfoContainer mChildren;
+  Vector3 mClusterSize;
 
   Actor mBackgroundImage;           ///< Stores the background image.
   Actor mTitle;                     ///< Stores the text title.