Merge "Updates following rename of PropertyBuffer to VertexBuffer" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / alignment / alignment-impl.cpp

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index f080ba3..8000612 100644 (file)
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/property-input.h>
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
 
 namespace Dali
@@ -215,8 +215,8 @@ void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
   {
     Actor child = Self().GetChildAt(i);
 
-    child.SetAnchorPoint( anchorPointAndParentOrigin );
-    child.SetParentOrigin( anchorPointAndParentOrigin );
+    child.SetProperty( Actor::Property::ANCHOR_POINT, anchorPointAndParentOrigin );
+    child.SetProperty( Actor::Property::PARENT_ORIGIN, anchorPointAndParentOrigin );
 
     Vector2 currentChildSize( child.GetTargetSize().GetVectorXY() );
     if( currentChildSize == Vector2::ZERO )
@@ -280,7 +280,7 @@ void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
       }
     }
 
-    child.SetPosition( GetPosition( mPadding, mHorizontal, mVertical , newChildSize, currentChildSize ) );
+    child.SetProperty( Actor::Property::POSITION, GetPosition( mPadding, mHorizontal, mVertical , newChildSize, currentChildSize ) );
 
     if( renegotiate )
     {
@@ -290,7 +290,7 @@ void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
 }
 
 Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
   mHorizontal( horizontal ),
   mVertical( vertical ),
   mScaling( Toolkit::Alignment::ScaleNone ),