Fixed a bug removing old PropertyAnimation
authorBongjoo Seo <bongjoo.seo@samsung.com>
Tue, 10 Sep 2013 10:28:11 +0000 (19:28 +0900)
committerBongjoo Seo <bongjoo.seo@samsung.com>
Tue, 10 Sep 2013 10:28:11 +0000 (19:28 +0900)
Change-Id: If29f300e8d1538620a95c1a70c6b3b4ec2fd7a5e
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>
src/ui/animations/FUiAnim_VisualElementImpl.cpp
src/ui/inc/FUiAnim_EflLayer.h

index 8577d11..a082757 100644 (file)
@@ -535,7 +535,7 @@ _VisualElementImpl::CreateImplicitAnimationIfNeeded( const String& property,
                { // remove sub property
                        for(int i = 0 ; pSubProperties[i] != NULL ; i++)
                        {
-                               pAnimationManager->RemoveAnimationByProperty(*__pPublicInstance, *pSubProperties[i]);
+                               pAnimationManager->RemoveAnimationByProperty(*__pPresentation->__pPublicInstance, *pSubProperties[i]);
                        }
                }
                if (unlikely(pAnimation))
@@ -560,6 +560,15 @@ _VisualElementImpl::CreateImplicitAnimationIfNeeded( const String& property,
        }
        else
        {
+
+               if(pSubProperties)
+               { // remove sub property
+                       for(int i = 0 ; pSubProperties[i] != NULL ; i++)
+                       {
+                               pAnimationManager->RemoveAnimationByProperty(*__pPresentation->__pPublicInstance, *pSubProperties[i]);
+                       }
+               }
+
                pAnimationManager->RemoveAnimationByProperty(*__pPresentation->__pPublicInstance, property);
                r = false;
        }
index 2d85fad..338add1 100644 (file)
@@ -64,7 +64,6 @@ public:
        float GetOpacity(void);
 
        result SetOrientationChanged(int orientation);
-       result SetInternalBounds(void);
 
        void SetOwner(_EflLayer* pOwner);