From df9f57f40038391a7d1e7c8c531def42cb2ff690 Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Mon, 25 Feb 2019 15:57:55 +0900 Subject: [PATCH] Revert "[Tizen] Fix z value issue" This reverts commit 70473dbe82e68393b85e8ecae54e64135c495c55. Change-Id: I090a65759dc1ec980ceb31e1bbb713e7ab6f98e7 --- dali-toolkit/internal/layouting/layout-controller-impl.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dali-toolkit/internal/layouting/layout-controller-impl.cpp b/dali-toolkit/internal/layouting/layout-controller-impl.cpp index b0637b3..9d0b947 100644 --- a/dali-toolkit/internal/layouting/layout-controller-impl.cpp +++ b/dali-toolkit/internal/layouting/layout-controller-impl.cpp @@ -347,19 +347,13 @@ void LayoutController::PerformLayoutPositioning( LayoutPositionDataArray& layout { if( !layoutPositionData.animated ) { - actor.SetX( layoutPositionData.left ); - actor.SetY( layoutPositionData.top ); - - actor.SetProperty( Actor::Property::SIZE_WIDTH, layoutPositionData.right - layoutPositionData.left ); - actor.SetProperty( Actor::Property::SIZE_HEIGHT, layoutPositionData.bottom - layoutPositionData.top ); + actor.SetPosition( layoutPositionData.left, layoutPositionData.top ); + actor.SetSize( layoutPositionData.right - layoutPositionData.left, layoutPositionData.bottom - layoutPositionData.top ); } else { - actor.SetX( actor.GetCurrentPosition().x ); - actor.SetY( actor.GetCurrentPosition().y ); - - actor.SetProperty( Actor::Property::SIZE_WIDTH, actor.GetCurrentSize().x ); - actor.SetProperty( Actor::Property::SIZE_HEIGHT, actor.GetCurrentSize().y ); + actor.SetPosition( actor.GetCurrentPosition() ); + actor.SetSize( actor.GetCurrentSize() ); } } } -- 2.7.4