Merge changes I17acf67f,If2410a4d into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / bubble-effect / bubble-emitter-impl.cpp

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index d4c46ea..7c3697c 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -211,7 +211,7 @@ void BubbleEmitter::OnInitialize()
 {
   // Create the root actor, all the meshActor should be its children
   mBubbleRoot = Actor::New();
-  mBubbleRoot.SetSize(mMovementArea);
+  mBubbleRoot.SetProperty( Actor::Property::SIZE, mMovementArea );
 
   // Prepare the frame buffer to store the color adjusted background texture
   Vector2 imageSize = Vector2( mMovementArea.width/4.f, mMovementArea.height/4.f );
@@ -238,7 +238,7 @@ void BubbleEmitter::OnInitialize()
 
   // Create a cameraActor for the off screen render task.
   mCameraActor = CameraActor::New(mMovementArea);
-  mCameraActor.SetParentOrigin(ParentOrigin::CENTER);
+  mCameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
 
   Stage stage = Stage::GetCurrent();
 
@@ -258,8 +258,8 @@ void BubbleEmitter::SetBackground( Texture bgTexture, const Vector3& hsvDelta )
 
   //Create RenderTask source actor
   Actor sourceActor = Actor::New();
-  sourceActor.SetSize( mMovementArea );
-  sourceActor.SetParentOrigin(ParentOrigin::CENTER);
+  sourceActor.SetProperty( Actor::Property::SIZE, mMovementArea );
+  sourceActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   sourceActor.RegisterProperty( "uHSVDelta", hsvDelta );
   Stage::GetCurrent().Add( sourceActor );