diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c index 40924807aa..25c2787876 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.c +++ b/src/lib/elementary/efl_ui_scroll_manager.c @@ -1130,11 +1130,8 @@ _efl_ui_scroll_manager_mouse_down_event_cb(void *data, if (ev->button == 1) { - sd->down.hist.est_timestamp_diff = + sd->down.est_timestamp_diff = ecore_loop_time_get() - ((double)ev->timestamp / 1000.0); - sd->down.hist.tadd = 0.0; - sd->down.hist.dxsum = 0.0; - sd->down.hist.dysum = 0.0; sd->down.now = EINA_TRUE; sd->down.dragged = EINA_FALSE; sd->down.dir_x = EINA_FALSE; @@ -1753,7 +1750,7 @@ _efl_ui_scroll_manager_hold_enterer(void *data) double t; } pos[100]; - tdiff = sd->down.hist.est_timestamp_diff; + tdiff = sd->down.est_timestamp_diff; tnow = ecore_loop_time_get(); twin = _elm_config->scroll_smooth_time_window; for (i = 0; i < 60; i++) diff --git a/src/lib/elementary/efl_ui_widget_scroll_manager.h b/src/lib/elementary/efl_ui_widget_scroll_manager.h index cfccf39b17..d6c478eb6e 100644 --- a/src/lib/elementary/efl_ui_widget_scroll_manager.h +++ b/src/lib/elementary/efl_ui_widget_scroll_manager.h @@ -38,11 +38,7 @@ typedef struct _Efl_Ui_Scroll_Manager_Data double timestamp; } history[60]; - struct - { - double tadd, dxsum, dysum; - double est_timestamp_diff; - } hist; + double est_timestamp_diff; double onhold_vx, onhold_vy; double onhold_vxe, onhold_vye; diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index e9c668c5c0..98e0e06b3d 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -3017,11 +3017,8 @@ _elm_scroll_mouse_down_event_cb(void *data, } if (ev->button == 1) { - sid->down.hist.est_timestamp_diff = + sid->down.est_timestamp_diff = ecore_loop_time_get() - ((double)ev->timestamp / 1000.0); - sid->down.hist.tadd = 0.0; - sid->down.hist.dxsum = 0.0; - sid->down.hist.dysum = 0.0; sid->down.now = EINA_TRUE; sid->down.dragged = EINA_FALSE; sid->down.dir_x = EINA_FALSE; @@ -3256,7 +3253,7 @@ _elm_scroll_hold_enterer(void *data) double t; } pos[100]; - tdiff = sid->down.hist.est_timestamp_diff; + tdiff = sid->down.est_timestamp_diff; tnow = ecore_loop_time_get(); twin = _elm_config->scroll_smooth_time_window; for (i = 0; i < 60; i++) diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h index 881d4934c4..5760c12514 100644 --- a/src/lib/elementary/elm_interface_scrollable.h +++ b/src/lib/elementary/elm_interface_scrollable.h @@ -102,11 +102,7 @@ struct _Elm_Scrollable_Smart_Interface_Data double timestamp; } history[60]; - struct - { - double tadd, dxsum, dysum; - double est_timestamp_diff; - } hist; + double est_timestamp_diff; double dragged_began_timestamp; double anim_start;