From 0a533b43106695f03a25bf3d518d6a48583421c3 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 24 Jul 2019 21:28:49 +0900 Subject: [PATCH] Revert "Revert "efl/scroll manager: stop clearing animators on every wheel event"" This reverts commit a836c73ef61f5557746c5e4d944b01a77bc3a8de. Sorry, I mistook the picking of commit id... --- src/lib/elementary/efl_ui_scroll_manager.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c index 5323288..63654f3 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.c +++ b/src/lib/elementary/efl_ui_scroll_manager.c @@ -1558,10 +1558,11 @@ _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) { - _scroll_manager_scrollto_animator_del(sd); - - if (!sd->pan_obj) return; - if (sd->freeze) return; + if (!sd->pan_obj || sd->freeze) + { + _scroll_manager_scrollto_animator_del(sd); + return; + } _scroll_manager_scrollto_x_animator_add(sd, sx, x, tx, interp); _scroll_manager_scrollto_y_animator_add(sd, sy, y, ty, interp); } -- 2.7.4