From d78c08ec6a92ab08da3dc21fe46e85c58b74998f Mon Sep 17 00:00:00 2001 From: Anton Obzhirov Date: Thu, 6 Dec 2018 15:18:23 +0000 Subject: [PATCH] [Tizen] Workaround in AbsoluteLayout for animation bug in legacy application. Change-Id: Ifcbdd5e374b65974b6e7160e47a0457240903f9e --- dali-toolkit/internal/layouting/absolute-layout-impl.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dali-toolkit/internal/layouting/absolute-layout-impl.cpp b/dali-toolkit/internal/layouting/absolute-layout-impl.cpp index 8a635af..d69f773 100644 --- a/dali-toolkit/internal/layouting/absolute-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/absolute-layout-impl.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -158,6 +159,12 @@ void AbsoluteLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top LayoutLength childHeight = childLayout->GetMeasuredHeight(); auto childPosition = childOwner.GetProperty< Vector3 >( Actor::Property::POSITION ); + // Check if there on going position or size animation and skip it to avoid legacy application regressions + if( DevelActor::IsPositionOrSizeCurrentlyAnimating( Actor::DownCast( childOwner ) ) && + !childLayout->IsLayoutAnimated() ) + { + continue; + } LayoutLength childTop = childPosition.y; LayoutLength childLeft = childPosition.x; -- 2.7.4