Change the scroll animation distance to be proportional to sine curve.

Change-Id: I9ed72f2ca522421020016f31ad68645c40519708

Conflicts:

	src/lib/elm_interface_scrollable.c

diff --git a/config/mobile/base.src b/config/mobile/base.src
index 913f520..4280f79 100644 (file)
--- a/config/mobile/base.src
+++ b/config/mobile/base.src
@@ -7,7 +7,7 @@ group "Elm_Config" struct {
   value "thumbscroll_hold_threshold" int: 100;
   value "thumbscroll_momentum_threshold" double: 100.0;
   value "thumbscroll_friction" double: 1.5;
-  value "thumbscroll_min_friction" double: 0.1;
+  value "thumbscroll_min_friction" double: 0.3;
   value "thumbscroll_friction_standard" double: 3500.0;
   value "thumbscroll_bounce_friction" double: 0.5;
   value "thumbscroll_bounce_enable" uchar: 0;

diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 35e8784..43ac592 100644 (file)
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -2264,9 +2264,28 @@ _elm_scroll_mouse_up_event_cb(void *data,
                        if ((_elm_config->thumbscroll_friction > 0.0) &&
                            (vel > _elm_config->thumbscroll_momentum_threshold))
                          {
-                            sid->down.dx = ((double)dx / at);
-                            sid->down.dy = ((double)dy / at);
+                            Evas_Coord vw, vh, aw, ah;
+                            int minx, miny, mx, my, px, py;
+                            double tt = 0.0, dtt = 0.0;
                             sid->down.extra_time = 0.0;
+
+                            psd->api->pos_min_get
+                              (sid->pan_obj, &minx, &miny);
+                            psd->api->pos_max_get(sid->pan_obj, &mx, &my);
+                            psd->api->pos_get(sid->pan_obj, &px, &py);
+                            _elm_scroll_content_viewport_size_get(sid->obj, &vw, &vh);
+                            if (dx > 0)
+                              sid->down.dx = (sin((M_PI * (double)dx / vw)
+                                                  - (M_PI / 2)) + 1) * vw / at;
+                            else
+                              sid->down.dx = (sin((M_PI * (double)dx / vw)
+                                                  + (M_PI / 2)) - 1) * vw / at;
+                            if (dy > 0)
+                              sid->down.dy = (sin((M_PI * (double)dy / vh)
+                                                  - (M_PI / 2)) + 1) * vh / at;
+                            else
+                              sid->down.dy = (sin((M_PI * (double)dy / vh)
+                                                  + (M_PI / 2)) - 1) * vh / at;
                             sid->down.pdx = sid->down.dx;
                             sid->down.pdy = sid->down.dy;
                             ox = -sid->down.dx;