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=cd36331d3a6e282412bc7d330a35bc91503fb86e;hp=8c6d13159f25c97d0aa46180b751539ae63c3485;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=7dc926f34a990b06a39dec7bc467803fe0773600 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 8c6d131..cd36331 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 @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include namespace //Unnamed namespace @@ -97,7 +97,7 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::SuperBlurView, Toolkit::Control, Create ) -DALI_PROPERTY_REGISTRATION( SuperBlurView, "image", MAP, IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, SuperBlurView, "image", MAP, IMAGE ) DALI_TYPE_REGISTRATION_END() @@ -137,7 +137,7 @@ Toolkit::SuperBlurView SuperBlurView::New( unsigned int blurLevels ) void SuperBlurView::OnInitialize() { - mBlurStrengthPropertyIndex = Self().RegisterProperty( "blur-strength",0.f ); + mBlurStrengthPropertyIndex = Self().RegisterProperty( "blurStrength", 0.f ); DALI_ASSERT_ALWAYS( mImageActors.size() == mBlurLevels+1 && "must synchronize the ImageActor group if blur levels got changed " ); for(unsigned int i=0; i<=mBlurLevels;i++) @@ -252,7 +252,7 @@ void SuperBlurView::ClearBlurResource() } } -void SuperBlurView::OnControlSizeSet( const Vector3& targetSize ) +void SuperBlurView::OnSizeSet( const Vector3& targetSize ) { if( mTargetSize != Vector2(targetSize) ) {