summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-07-24 20:47:20 +0900
committerHermet Park <hermetpark@gmail.com>2019-07-24 20:47:28 +0900
commita836c73ef61f5557746c5e4d944b01a77bc3a8de (patch)
treedc325a477b57de10e03fcf138ae235aefa12710a
parentac75934d06541fc82ddd241b2d5f42763b6298f4 (diff)
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.
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c9
1 files 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)
1558static void 1558static void
1559_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) 1559_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)
1560{ 1560{
1561 if (!sd->pan_obj || sd->freeze) 1561 _scroll_manager_scrollto_animator_del(sd);
1562 { 1562
1563 _scroll_manager_scrollto_animator_del(sd); 1563 if (!sd->pan_obj) return;
1564 return; 1564 if (sd->freeze) return;
1565 }
1566 _scroll_manager_scrollto_x_animator_add(sd, sx, x, tx, interp); 1565 _scroll_manager_scrollto_x_animator_add(sd, sx, x, tx, interp);
1567 _scroll_manager_scrollto_y_animator_add(sd, sy, y, ty, interp); 1566 _scroll_manager_scrollto_y_animator_add(sd, sy, y, ty, interp);
1568} 1567}