X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.cpp;h=2bb91e9b9445fbe78b074fe5fcb0f849bb26cbd7;hp=17aa375f05ce54b63523969ae6e062dfa3a8dfb5;hb=680c5587a1478717393d3a03cf6a17801edd00e0;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836 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 --- 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 - +// CLASS HEADER #include +// EXTERNAL INCLUDES +#include +#include + 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 ); } }