X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fsuper-blur-view%2Fsuper-blur-view-impl.cpp;h=f2b8a5fdcb97709964c01d358f51eed1e36456e8;hp=5544761f299b18a60220db3b7eb5db3be6dac38b;hb=cd7d41bc8e0a0816da28401207091344fbbe0b2c;hpb=2ec164cd618f93ccafe17b1d0b8ff16401ed4aef

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 5544761..f2b8a5f 100644
--- 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
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <cmath>
-#include <dali/public-api/animation/active-constraint.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/type-registry.h>
@@ -54,20 +53,20 @@ struct ActorOpacityConstraint
     mRange = Vector2( index*rangeLength, (index+1.f)*rangeLength );
   }
 
-  float operator()( float current, const PropertyInput& blurProperty )
+  void operator()( float& current, const PropertyInputContainer& inputs )
   {
-    float blurStrength = blurProperty.GetFloat();
+    float blurStrength = inputs[0]->GetFloat();
     if(blurStrength <= mRange.x)
     {
-      return 1.f;
+      current = 1.f;
     }
     else if(blurStrength > mRange.y)
     {
-      return 0.f;
+      current = 0.f;
     }
     else
     {
-      return (mRange.y - blurStrength)/(mRange.y-mRange.x);
+      current = ( mRange.y - blurStrength) / ( mRange.y - mRange.x );
     }
   }
 
@@ -144,6 +143,7 @@ void SuperBlurView::OnInitialize()
   for(unsigned int i=0; i<=mBlurLevels;i++)
   {
     mImageActors[i] = ImageActor::New(  );
+    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 );
@@ -152,7 +152,9 @@ void SuperBlurView::OnInitialize()
 
   for(unsigned int i=0; i < mBlurLevels; i++)
   {
-    mImageActors[i].ApplyConstraint( Constraint::New<float>( Actor::Property::COLOR_ALPHA, ParentSource( mBlurStrengthPropertyIndex ), ActorOpacityConstraint(mBlurLevels, i) ) );
+    Constraint constraint = Constraint::New<float>( mImageActors[i], Actor::Property::COLOR_ALPHA, ActorOpacityConstraint(mBlurLevels, i) );
+    constraint.AddSource( ParentSource( mBlurStrengthPropertyIndex ) );
+    constraint.Apply();
   }
 
   Self().SetSize(Stage::GetCurrent().GetSize());
@@ -250,16 +252,6 @@ void SuperBlurView::ClearBlurResource()
   }
 }
 
-void SuperBlurView::OnRelayout( const Vector2& size, RelayoutContainer& container )
-{
-  unsigned int numChildren = Self().GetChildCount();
-
-  for( unsigned int i=0; i<numChildren; ++i )
-  {
-    Self().GetChildAt(i).SetSize(size);
-  }
-}
-
 void SuperBlurView::OnControlSizeSet( const Vector3& targetSize )
 {
   if( mTargetSize != Vector2(targetSize) )