X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=b88b3d7a4279c4e05297c7593f4d681d74a55db3;hb=928136dbb9e23970f3894eabc7c8b224003b77be;hp=1697c9b58cf8a6c9592735cfff6411e2f4b2407d;hpb=1db0a8becea3dbdebaa942d934d91824a92434e7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 1697c9b..b88b3d7 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -231,7 +231,7 @@ void SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const actor.SetZ( BACKGROUND_ACTOR_Z_POSITION ); Constraint constraint = Constraint::New( constrainingIndex, - ParentSource( Actor::SIZE ), + ParentSource( Actor::Property::Size ), EqualToConstraint() ); actor.ApplyConstraint( constraint ); } @@ -788,8 +788,7 @@ void Control::SetBackgroundColor( const Vector4& color ) // Create Mesh Actor MeshActor meshActor = MeshActor::New( CreateMesh() ); - meshActor.SetAffectedByLighting( false ); - SetupBackgroundActor( meshActor, Actor::SCALE, color ); + SetupBackgroundActor( meshActor, Actor::Property::Scale, color ); // Set the background actor before adding so that we do not inform deriving classes background.actor = meshActor; @@ -820,7 +819,7 @@ void Control::SetBackground( Image image ) } ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, Actor::SIZE, background.color ); + SetupBackgroundActor( imageActor, Actor::Property::Size, background.color ); // Set the background actor before adding so that we do not inform derived classes background.actor = imageActor;