From a836c73ef61f5557746c5e4d944b01a77bc3a8de Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 24 Jul 2019 20:47:20 +0900 Subject: [PATCH] Revert "efl/scroll manager: stop clearing animators on every wheel event" This reverts commit e6393393ccafe59d4e434a78c79952601d93956a. This totally break popup control in Tizen, Please consider necessity of this patch, further potential side effects possibilities. --- src/lib/elementary/efl_ui_scroll_manager.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c index 63654f3eba..53232883cc 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.c +++ b/src/lib/elementary/efl_ui_scroll_manager.c @@ -1558,11 +1558,10 @@ _scroll_manager_scrollto_y_animator_del(Efl_Ui_Scroll_Manager_Data *sd) static void _scroll_manager_scrollto_animator_add(Efl_Ui_Scroll_Manager_Data *sd, Evas_Coord sx, Evas_Coord sy, Evas_Coord x, Evas_Coord y, double tx, double ty, InterpType interp) { - if (!sd->pan_obj || sd->freeze) - { - _scroll_manager_scrollto_animator_del(sd); - return; - } + _scroll_manager_scrollto_animator_del(sd); + + if (!sd->pan_obj) return; + if (sd->freeze) return; _scroll_manager_scrollto_x_animator_add(sd, sx, x, tx, interp); _scroll_manager_scrollto_y_animator_add(sd, sy, y, ty, interp); }