Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / super-blur-view / super-blur-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 624e973..8c6d131 100644 (file)
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -104,7 +104,7 @@ DALI_TYPE_REGISTRATION_END()
 } // unnamed namespace
 
 SuperBlurView::SuperBlurView( unsigned int blurLevels )
-: Control( CONTROL_BEHAVIOUR_NONE ),
+: Control( ControlBehaviour( DISABLE_SIZE_NEGOTIATION ) ),
   mBlurLevels( blurLevels ),
   mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
   mResourcesCleared( true ),
@@ -143,7 +143,7 @@ void SuperBlurView::OnInitialize()
   for(unsigned int i=0; i<=mBlurLevels;i++)
   {
     mImageActors[i] = ImageActor::New(  );
-    mImageActors[i].SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+    mImageActors[i].SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     mImageActors[i].SetParentOrigin( ParentOrigin::CENTER );
     mImageActors[i].SetZ(-static_cast<float>(i)*0.01f);
     mImageActors[i].SetColorMode( USE_OWN_MULTIPLY_PARENT_ALPHA );