From: Dae Young Ryu <karzia@samsung.com>
Date: Fri, 27 Sep 2013 02:51:37 +0000 (+0900)
Subject: bug fixed : before implicit animation is started , remove sub property
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c404c5267bbd5ff0ddcba70516b33fb9ac202ed4;p=framework%2Fosp%2Fuifw.git

bug fixed : before implicit animation is started , remove sub property

Change-Id: I060b27ed84c96f46c56c0271055bdce54c00bcaf
Signed-off-by: Dae Young Ryu <karzia@samsung.com>
---

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;