Include required header files directly rather than through dali.h

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / controls / scrollable / item-view / grid-layout.cpp

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
index 17aa375..2bb91e9 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
@@ -15,10 +15,13 @@
  *
  */
 
-#include <algorithm>
-
+// CLASS HEADER
 #include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
 
+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/animation.h>
+
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;
@@ -623,7 +626,6 @@ void GridLayout::GetResizeAnimation(Animation& animation, Actor actor, Vector3 s
     // so that we can avoid the actors overlapping during orientation change.
     animation.Resize( actor, shrink, AlphaFunctions::EaseOut, 0.0f, durationSeconds * 0.5f );
     animation.Resize( actor, size, AlphaFunctions::EaseIn, 0.0f, durationSeconds );
-    animation.SetDestroyAction( Animation::Bake );
   }
 }