hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=735f05de7606b7fd04d53fcf7fcdc975c205e8bc
commit 735f05de7606b7fd04d53fcf7fcdc975c205e8bc
Author: Hermet Park <hermetp...@gmail.com>
Date: Wed Jul 24 21:28:49 2019 +0900
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 53232883cc..63654f3eba 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);
}
--
