elm els_scroller: Cancel wanted region set when scrollto animator is

enabled. Check scrollto.x.animator and scrollto.y.animator
when _elm_smart_scroller_wanted_region_set is called.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66126 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index 327698c..0f9da3b 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -1472,7 +1472,8 @@ _elm_smart_scroller_wanted_region_set(Evas_Object *obj)
 
    if (sd->down.now || sd->down.momentum_animator ||
        sd->down.bounce_x_animator || sd->down.bounce_y_animator ||
-       sd->down.hold_animator || sd->down.onhold_animator) return;
+       sd->down.hold_animator || sd->down.onhold_animator ||
+       sd->scrollto.x.animator || sd->scrollto.y.animator) return;
 
    sd->child.resized = EINA_FALSE;