From 09e55906d2c139f7234ad6fedde1798ecbd7a371 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Tue, 13 Dec 2011 01:20:21 +0000 Subject: [PATCH] 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. SVN revision: 66126 --- legacy/elementary/src/lib/els_scroller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index 327698c777..0f9da3bfdf 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/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;