kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

From: Jaehwan Kim <jae.hwan.kim@samsung.com> 

Subject: [E-devel] [Patch] The scroll animation doesn't work when the
scroll-action is started from the outside of a viewport.

In scroller, if the scroll-action is started from the outside of a
viewport,
the momentum animation does not work because of the bounce-effect.

Please see the below video.
http://www.youtube.com/watch?v=xNvLSxWjrDE
 
The below video is the scroller after applying my patch.
http://www.youtube.com/watch?v=hM3o1kxC674



SVN revision: 61799
This commit is contained in:
Jaehwan Kim 2011-07-27 09:21:54 +00:00 committed by Carsten Haitzler
parent 2a09e2e7a8
commit 4ebfb567bd
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/src/lib/els_scroller.c
View File

@ -470,6 +470,8 @@ _smart_momentum_end(Smart_Data *sd)
sd->down.bounce_y_hold = 0;
sd->down.ax = 0;
sd->down.ay = 0;
sd->down.dx = 0;
sd->down.dy = 0;
sd->down.pdx = 0;
sd->down.pdy = 0;
}
@ -970,19 +972,25 @@ elm_smart_scroller_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm");
if (!sd->down.bounce_x_animator)
{
if ((x < minx) || (x > (mx + minx)))
if (((x < minx) && (0 <= sd->down.dx)) ||
((x > (mx + minx)) && (0 >= sd->down.dx)))
{
sd->bouncemex = 1;
bounce_eval(sd);
}
else
sd->bouncemex = 0;
}
if (!sd->down.bounce_y_animator)
{
if ((y < miny) || (y > my + miny))
if (((y < miny) && (0 <= sd->down.dy)) ||
((y > (my + miny)) && (0 >= sd->down.dy)))
{
sd->bouncemey = 1;
bounce_eval(sd);
}
else
sd->bouncemey = 0;
}
if ((x != px) || (y != py))
{