From 2988b47f3ae1199237be57a30046ee72f960c785 Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Fri, 12 Apr 2013 19:44:36 +0900 Subject: [PATCH] [Scroller] Quit the scroll animator if the scroller don't have a bounce and reach a edge. Change-Id: I14aa195946093ebff07e398f41149d2e8874c7de --- src/lib/elm_interface_scrollable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c index 67b878f..6058f9a 100644 --- a/src/lib/elm_interface_scrollable.c +++ b/src/lib/elm_interface_scrollable.c @@ -1835,12 +1835,12 @@ _elm_scroll_momentum_animator(void *data) _elm_scroll_wanted_coordinates_update(sid, x, y); psd->api->pos_max_get(sid->pan_obj, &maxx, &maxy); psd->api->pos_min_get(sid->pan_obj, &minx, &miny); - if (!sid->bounce_horiz) + if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_horiz) { if (x <= minx) no_bounce_x_end = EINA_TRUE; if ((x - minx) >= maxx) no_bounce_x_end = EINA_TRUE; } - if (!sid->bounce_vert) + if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_vert) { if (y <= miny) no_bounce_y_end = EINA_TRUE; if ((y - miny) >= maxy) no_bounce_y_end = EINA_TRUE; -- 2.7.4