X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=ba1fd7fa235dcc44a1aeaa118b5b02c76f0f371b;hb=cbda2de83c5025276c35d69044934ab1258b4998;hp=1be8bd6e84a592a55edf1dc313f315bd4bf789e8;hpb=5e937a6322849b76d49d5b3f41cb5d91c94acd3e;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 1be8bd6..ba1fd7f 100755 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -504,7 +504,7 @@ void Control::OnPinch(const PinchGesture& pinch) *( mImpl->mStartingPinchScale ) = Self().GetCurrentProperty< Vector3 >( Actor::Property::SCALE ); } - Self().SetScale( *( mImpl->mStartingPinchScale ) * pinch.scale ); + Self().SetProperty( Actor::Property::SCALE, *( mImpl->mStartingPinchScale ) * pinch.scale ); } void Control::OnPan( const PanGesture& pan ) @@ -668,7 +668,7 @@ void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) childOffset.x += ( mImpl->mMargin.start + padding.start ); childOffset.y += ( mImpl->mMargin.top + padding.top ); - child.SetPosition( childOffset.x, childOffset.y ); + child.SetProperty( Actor::Property::POSITION, Vector2( childOffset.x, childOffset.y ) ); } container.Add( child, newChildSize ); }