X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.cpp;h=e1ca4d04111406a82fe5d7f11abceaa3b782e16e;hb=41278d3fb755de3cb89edf6d80603b18562b4e01;hp=9339f0a1f0e9de5c84bae6dd25a452b247b5656a;hpb=c3f7ea6cb0c0b75c2276193aff88b5c7a679a2d5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp index 9339f0a..e1ca4d0 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp @@ -506,23 +506,6 @@ void GridLayout::GetDefaultItemSize( unsigned int itemId, const Vector3& layoutS itemSize.height = itemSize.depth = itemSize.width * 0.75f; } -void GridLayout::GetResizeAnimation(Animation& animation, Actor actor, Vector3 size, float durationSeconds) const -{ - if(animation) - { - Vector3 currentSize( actor.GetCurrentSize() ); - Vector3 shrink( currentSize ); - - shrink.width = std::min(size.width, currentSize.width); - shrink.height = std::min(size.height, currentSize.height); - - // Do a nonlinear size animation to shrink the actor first when the actor size changes, - // so that we can avoid the actors overlapping during orientation change. - animation.AnimateTo( Property( actor, Actor::Property::SIZE ), shrink, AlphaFunction::EASE_OUT, TimePeriod( 0.0f, durationSeconds * 0.5f ) ); - animation.AnimateTo( Property( actor, Actor::Property::SIZE ), size, AlphaFunction::EASE_IN, TimePeriod( 0.0f, durationSeconds ) ); - } -} - Degree GridLayout::GetScrollDirection() const { Degree scrollDirection(0.0f);