Remove Constraints from Cluster,ToolBar,View & ImageView

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

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index 3a81862..d49c718 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -18,6 +18,11 @@
 // CLASS HEADER
 #include "tool-bar-impl.h"
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/type-registry.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
@@ -68,7 +73,7 @@ void ToolBar::SetBackground( Actor background )
   // ToolBar image
   background.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
   background.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
-  background.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+  background.SetSize( mToolBarSize );
 
   RenderableActor renderableActor = RenderableActor::DownCast( background );
   if ( renderableActor )
@@ -77,6 +82,7 @@ void ToolBar::SetBackground( Actor background )
   }
 
   Self().Add( background );
+  mBackground = background;
 }
 
 void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding )
@@ -351,6 +357,12 @@ void ToolBar::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
   Relayout( mLayout, size, container );
 }
 
+void ToolBar::OnControlSizeSet( const Vector3& targetSize )
+{
+  mToolBarSize = targetSize;
+  mBackground.SetSize( mToolBarSize );
+}
+
 } // namespace Internal
 
 } // namespace Toolkit