X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=5b86ab12117ce0bc69a4653181f4801cc2ed3578;hb=refs%2Fchanges%2F46%2F36346%2F1;hp=1697c9b58cf8a6c9592735cfff6411e2f4b2407d;hpb=4b38b709efae6ba534f7d336b70dabb74c804e03;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..5b86ab1 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;