bug fixed : before implicit animation is started , remove sub property
authorDae Young Ryu <karzia@samsung.com>
Fri, 27 Sep 2013 02:51:37 +0000 (11:51 +0900)
committerDae Young Ryu <karzia@samsung.com>
Fri, 27 Sep 2013 02:51:37 +0000 (11:51 +0900)
Change-Id: I060b27ed84c96f46c56c0271055bdce54c00bcaf
Signed-off-by: Dae Young Ryu <karzia@samsung.com>
src/ui/animations/FUiAnim_VisualElementImpl.cpp

index 9297101..5a57270 100644 (file)
@@ -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;