From 361837ba62f4be18abe21f80237fee9037761b6f Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Fri, 23 Sep 2011 09:41:51 +0900 Subject: [PATCH] [*][els_scroller.c] Always check and delete hold_animator on mouse up. (upstream merge r63539) git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63539 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 Conflicts: src/lib/els_scroller.c --- src/lib/els_scroller.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c index 051c182..3cc79ec 100644 --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -1970,11 +1970,6 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev } } } - if (sd->down.hold_animator) - { - ecore_animator_del(sd->down.hold_animator); - sd->down.hold_animator = NULL; - } } else { @@ -2031,11 +2026,13 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy); } } - if (sd->down.hold_animator) - { - ecore_animator_del(sd->down.hold_animator); - sd->down.hold_animator = NULL; - } + } + if (sd->down.hold_animator) + { + ecore_animator_del(sd->down.hold_animator); + sd->down.hold_animator = NULL; + if (sd->child.resized) + _elm_smart_scroller_wanted_region_set(sd->smart_obj); } if (sd->down.scroll) { -- 2.7.4