Peter M. Groen / dali-demo

Commit 79030fe2a3b32b66048860b4e2041675e4b39d60

Authored by Adeel Kazmi
1 parent 1f2e33f8

(Animation) Updates following DestroyAction removal 

Change-Id: I0683b34b0629ebcc154370c0d1313b96f08259cb
Inline Side-by-side
Showing 3 changed files with 1 additions and 3 deletions
demo/dali-table-view.cpp
  View file @79030fe
@@ -606,7 +606,7 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) @@ -606,7 +606,7 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
606 if( consumed ) 606 if( consumed )
607 { 607 {
608 mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME ); 608 mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME );
609 - mPressedAnimation.SetDestroyAction( Animation::Discard ); 609 + mPressedAnimation.SetEndAction( Animation::Discard );
610 610
611 // scale the content actor within the Tile, as to not affect the placement within the Table. 611 // scale the content actor within the Tile, as to not affect the placement within the Table.
612 Actor content = actor.GetChildAt(0); 612 Actor content = actor.GetChildAt(0);
examples/motion/motion-blur-example.cpp
  View file @79030fe
@@ -306,7 +306,6 @@ public: @@ -306,7 +306,6 @@ public:
306 { 306 {
307 // has parent so we expect it to be on stage, start animation 307 // has parent so we expect it to be on stage, start animation
308 mRotateAnimation = Animation::New( ORIENTATION_DURATION ); 308 mRotateAnimation = Animation::New( ORIENTATION_DURATION );
309 - mRotateAnimation.SetDestroyAction( Animation::Bake );  
310 mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut ); 309 mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut );
311 mRotateAnimation.Resize( mView, targetSize.width, targetSize.height ); 310 mRotateAnimation.Resize( mView, targetSize.width, targetSize.height );
312 mRotateAnimation.Play(); 311 mRotateAnimation.Play();
examples/motion/motion-stretch-example.cpp
  View file @79030fe
@@ -219,7 +219,6 @@ public: @@ -219,7 +219,6 @@ public:
219 { 219 {
220 // has parent so we expect it to be on stage, start animation 220 // has parent so we expect it to be on stage, start animation
221 mRotateAnimation = Animation::New( ORIENTATION_DURATION ); 221 mRotateAnimation = Animation::New( ORIENTATION_DURATION );
222 - mRotateAnimation.SetDestroyAction( Animation::Bake );  
223 mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut ); 222 mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut );
224 mRotateAnimation.Resize( mView, targetSize.width, targetSize.height ); 223 mRotateAnimation.Resize( mView, targetSize.width, targetSize.height );
225 mRotateAnimation.Play(); 224 mRotateAnimation.Play();