From 79030fe2a3b32b66048860b4e2041675e4b39d60 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 30 Sep 2014 10:36:32 +0100 Subject: [PATCH] (Animation) Updates following DestroyAction removal Change-Id: I0683b34b0629ebcc154370c0d1313b96f08259cb --- demo/dali-table-view.cpp | 2 +- examples/motion/motion-blur-example.cpp | 1 - examples/motion/motion-stretch-example.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 00bda38d..4014b55a 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -606,7 +606,7 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) if( consumed ) { mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME ); - mPressedAnimation.SetDestroyAction( Animation::Discard ); + mPressedAnimation.SetEndAction( Animation::Discard ); // scale the content actor within the Tile, as to not affect the placement within the Table. Actor content = actor.GetChildAt(0); diff --git a/examples/motion/motion-blur-example.cpp b/examples/motion/motion-blur-example.cpp index b10334c5..837fb925 100644 --- a/examples/motion/motion-blur-example.cpp +++ b/examples/motion/motion-blur-example.cpp @@ -306,7 +306,6 @@ public: { // has parent so we expect it to be on stage, start animation mRotateAnimation = Animation::New( ORIENTATION_DURATION ); - mRotateAnimation.SetDestroyAction( Animation::Bake ); mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut ); mRotateAnimation.Resize( mView, targetSize.width, targetSize.height ); mRotateAnimation.Play(); diff --git a/examples/motion/motion-stretch-example.cpp b/examples/motion/motion-stretch-example.cpp index 3ff484e7..549e912d 100644 --- a/examples/motion/motion-stretch-example.cpp +++ b/examples/motion/motion-stretch-example.cpp @@ -219,7 +219,6 @@ public: { // has parent so we expect it to be on stage, start animation mRotateAnimation = Animation::New( ORIENTATION_DURATION ); - mRotateAnimation.SetDestroyAction( Animation::Bake ); mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut ); mRotateAnimation.Resize( mView, targetSize.width, targetSize.height ); mRotateAnimation.Play(); -- 2.34.1