forked from enlightenment/efl
The animator should be removed when mouse is down and the _smart_event_mouse_move function occurs.
SVN revision: 67318
This commit is contained in:
parent
fb3f515001
commit
a091b950f3
|
@ -2273,25 +2273,6 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
|
||||||
sd->down.hold_parent = EINA_TRUE;
|
sd->down.hold_parent = EINA_TRUE;
|
||||||
evas_post_event_callback_push(e, _smart_event_post_move, sd);
|
evas_post_event_callback_push(e, _smart_event_post_move, sd);
|
||||||
|
|
||||||
if (sd->scrollto.x.animator)
|
|
||||||
{
|
|
||||||
Evas_Coord px;
|
|
||||||
ecore_animator_del(sd->scrollto.x.animator);
|
|
||||||
sd->scrollto.x.animator = NULL;
|
|
||||||
sd->pan_func.get(sd->pan_obj, &px, NULL);
|
|
||||||
sd->down.sx = px;
|
|
||||||
sd->down.x = sd->down.history[0].x;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sd->scrollto.y.animator)
|
|
||||||
{
|
|
||||||
Evas_Coord py;
|
|
||||||
ecore_animator_del(sd->scrollto.y.animator);
|
|
||||||
sd->scrollto.y.animator = NULL;
|
|
||||||
sd->pan_func.get(sd->pan_obj, NULL, &py);
|
|
||||||
sd->down.sy = py;
|
|
||||||
sd->down.y = sd->down.history[0].y;
|
|
||||||
}
|
|
||||||
// FIXME: respect elm_widget_scroll_hold_get of parent container
|
// FIXME: respect elm_widget_scroll_hold_get of parent container
|
||||||
if (_elm_config->thumbscroll_enable)
|
if (_elm_config->thumbscroll_enable)
|
||||||
{
|
{
|
||||||
|
@ -2299,6 +2280,26 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
|
||||||
{
|
{
|
||||||
int dodir = 0;
|
int dodir = 0;
|
||||||
|
|
||||||
|
if (sd->scrollto.x.animator)
|
||||||
|
{
|
||||||
|
Evas_Coord px;
|
||||||
|
ecore_animator_del(sd->scrollto.x.animator);
|
||||||
|
sd->scrollto.x.animator = NULL;
|
||||||
|
sd->pan_func.get(sd->pan_obj, &px, NULL);
|
||||||
|
sd->down.sx = px;
|
||||||
|
sd->down.x = sd->down.history[0].x;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sd->scrollto.y.animator)
|
||||||
|
{
|
||||||
|
Evas_Coord py;
|
||||||
|
ecore_animator_del(sd->scrollto.y.animator);
|
||||||
|
sd->scrollto.y.animator = NULL;
|
||||||
|
sd->pan_func.get(sd->pan_obj, NULL, &py);
|
||||||
|
sd->down.sy = py;
|
||||||
|
sd->down.y = sd->down.history[0].y;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef SCROLLDBG
|
#ifdef SCROLLDBG
|
||||||
printf("::: %i %i\n", ev->cur.canvas.x, ev->cur.canvas.y);
|
printf("::: %i %i\n", ev->cur.canvas.x, ev->cur.canvas.y);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue