Re-Commit by git conflic - Modify for calculating magneticScroll frame

Change-Id: Ibe609ad0c5aec358ee9581e7faa6235241c85b72
Signed-off-by: wonyoung12.lee <wonyoung12.lee@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_IconListUtils.cpp b/src/ui/controls/FUiCtrl_IconListUtils.cpp
index b893422..cf0a786 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListUtils.cpp
+++ b/src/ui/controls/FUiCtrl_IconListUtils.cpp
@@ -89,14 +89,25 @@ MagneticScrollAnimation::GetMagneticScrollAnimationFrame(float& diff)
        else if (!_FloatCompareLE(__scroll, 0.0f))
        {
                diff = (__scroll - 1) / MAGNETIC_SCROLL_EFFECT_DIVIDER + 1;
+               __scroll -= diff;
+               if (__scroll < 0.0f)
+               {
+                       diff += __scroll;
+                       __scroll = 0.0f;
+               }
+               return true;
        }
        else
        {
                diff = (__scroll + 1) / MAGNETIC_SCROLL_EFFECT_DIVIDER - 1;
+               __scroll -= diff;
+               if (__scroll > 0.0f)
+               {
+                       diff += __scroll;
+                       __scroll = 0.0f;
+               }
+               return true;
        }
-
-       __scroll -= diff;
-       return true;
 }
 
 void