From c404c5267bbd5ff0ddcba70516b33fb9ac202ed4 Mon Sep 17 00:00:00 2001 From: Dae Young Ryu Date: Fri, 27 Sep 2013 11:51:37 +0900 Subject: [PATCH] bug fixed : before implicit animation is started , remove sub property Change-Id: I060b27ed84c96f46c56c0271055bdce54c00bcaf Signed-off-by: Dae Young Ryu --- src/ui/animations/FUiAnim_VisualElementImpl.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ui/animations/FUiAnim_VisualElementImpl.cpp b/src/ui/animations/FUiAnim_VisualElementImpl.cpp index 9297101..5a57270 100644 --- a/src/ui/animations/FUiAnim_VisualElementImpl.cpp +++ b/src/ui/animations/FUiAnim_VisualElementImpl.cpp @@ -1116,12 +1116,26 @@ _VisualElementImpl::CreateImplicitAnimationIfNeeded( const String& property, // WARNING: // Remove previous animation even when trying to change the property without animation. pAnimationManager->RemoveAnimationByProperty(*pTarget, property); + if(pSubProperties) + { // remove sub property + for(int i = 0 ; pSubProperties[i] != NULL ; i++) + { + pAnimationManager->RemoveAnimationByProperty(*pTarget, *pSubProperties[i]); + } + } r = false; } } else { pAnimationManager->RemoveAnimationByProperty(*pTarget, property); + if(pSubProperties) + { // remove sub property + for(int i = 0 ; pSubProperties[i] != NULL ; i++) + { + pAnimationManager->RemoveAnimationByProperty(*pTarget, *pSubProperties[i]); + } + } r = false; } return r; -- 2.7.4