Hello,
This is Jaehwan Kim.
Thanks for your advice.
I changed the code following the way you guided
And I am in the list of AUTHORS.
The code is following.
Thanks.
Index: src/lib/els_scroller.c
===================================================================
--- src/lib/els_scroller.c (revision 54715)
+++ src/lib/els_scroller.c (working copy)
@@ -306,7 +306,7 @@ _smart_scrollto_x_animator(void *data)
px = sd->scrollto.x.end;
elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
sd->scrollto.x.animator = NULL;
- if (!sd->scrollto.y.animator)
+ if ((!sd->scrollto.y.animator) && (!sd->down.bounce_y_animator))
_smart_anim_stop(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
@@ -371,7 +371,7 @@ _smart_scrollto_y_animator(void *data)
py = sd->scrollto.y.end;
elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
sd->scrollto.y.animator = NULL;
- if (!sd->scrollto.x.animator)
+ if ((!sd->scrollto.x.animator) && (!sd->down.bounce_x_animator))
_smart_anim_stop(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
@@ -523,6 +523,9 @@ _smart_bounce_x_animator(void *data)
{
if (sd->down.momentum_animator)
sd->down.bounce_x_hold = 1;
+ else if ((!sd->down.bounce_y_animator) &&
+ (!sd->scrollto.y.animator))
+ _smart_anim_stop(sd->smart_obj);
sd->down.bounce_x_animator = NULL;
sd->down.pdx = 0;
sd->bouncemex = 0;
@@ -557,6 +560,9 @@ _smart_bounce_y_animator(void *data)
{
if (sd->down.momentum_animator)
sd->down.bounce_y_hold = 1;
+ else if ((!sd->down.bounce_x_animator) &&
+ (!sd->scrollto.y.animator))
+ _smart_anim_stop(sd->smart_obj);
sd->down.bounce_y_animator = NULL;
sd->down.pdy = 0;
sd->bouncemey = 0;
@@ -649,7 +655,7 @@ _smart_momentum_animator(void *data)
y = py;
}
elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
- if (dt >= 1.0)
+ if (dt >= 1.0 || ((sd->down.bounce_x_hold) && (sd->down.bounce_y_hold)))
{
_smart_anim_stop(sd->smart_obj);
sd->down.momentum_animator = NULL;
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
