From: Paul Wisbey
Date: Sun, 12 Feb 2017 19:50:34 +0000 (+0000)
Subject: [3.0] Fixed the ItemView already scrolled to end logic
X-Git-Tag: accepted/tizen/3.0/common/20170221.125105~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d45dd40fa5a4cb64b71c117f0e58861bbe35cf51
[3.0] Fixed the ItemView already scrolled to end logic
Change-Id: I7d4e9df6c4c801077a46e6957b6d159977646de2
---
diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 81cc7ae..7fb1034 100644
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -1176,10 +1176,12 @@ void ItemView::OnPan( const PanGesture& gesture )
mScrollAnimation.AnimateTo( Property(self, Toolkit::ItemView::Property::SCROLL_SPEED), 0.0f, AlphaFunction::EASE_OUT );
mIsFlicking = true;
+
// Check whether it has already scrolled to the end
- if(fabs(currentLayoutPosition - firstItemScrollPosition) > Math::MACHINE_EPSILON_0)
+ if( fabs(currentLayoutPosition - firstItemScrollPosition) < Math::MACHINE_EPSILON_0 )
{
- AnimateScrollOvershoot(0.0f);
+ AnimateScrollOvershoot( 0.0f );
+ RemoveAnimation( mScrollAnimation );
}
}