forked from enlightenment/efl
Quit the scroll animator if the scroller don't have a bounce and reach a edge.
This commit is contained in:
parent
9ad6f8d44e
commit
a1893332da
|
@ -1208,3 +1208,7 @@
|
||||||
|
|
||||||
* Add the API elm_scroller_page_scroll_limit_set/get.
|
* Add the API elm_scroller_page_scroll_limit_set/get.
|
||||||
It sets the maxium of the movable page at flicking.
|
It sets the maxium of the movable page at flicking.
|
||||||
|
|
||||||
|
2013-04-08 Jaehwan Kim
|
||||||
|
|
||||||
|
* Quit the scroll animator if the scroller don't have a bounce and reach a edge.
|
||||||
|
|
|
@ -198,6 +198,7 @@ Fixes:
|
||||||
* Fix the elm_shutdown bug in _elm_shutdown_config.
|
* Fix the elm_shutdown bug in _elm_shutdown_config.
|
||||||
* Fix box layout bug when items with max size force sizes below minimum.
|
* Fix box layout bug when items with max size force sizes below minimum.
|
||||||
* Fix ctxpopup geometry when parent is an elm_win.
|
* Fix ctxpopup geometry when parent is an elm_win.
|
||||||
|
* Quit the scroll animator if the scroller don't have a bounce and reach a edge.
|
||||||
|
|
||||||
Removals:
|
Removals:
|
||||||
|
|
||||||
|
|
|
@ -1945,12 +1945,13 @@ _elm_scroll_momentum_animator(void *data)
|
||||||
_elm_scroll_wanted_coordinates_update(sid, x, y);
|
_elm_scroll_wanted_coordinates_update(sid, x, y);
|
||||||
eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&maxx, &maxy));
|
eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&maxx, &maxy));
|
||||||
eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
|
eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
|
||||||
if (!sid->bounce_horiz)
|
|
||||||
|
if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_horiz)
|
||||||
{
|
{
|
||||||
if (x <= minx) no_bounce_x_end = EINA_TRUE;
|
if (x <= minx) no_bounce_x_end = EINA_TRUE;
|
||||||
if ((x - minx) >= maxx) no_bounce_x_end = EINA_TRUE;
|
if ((x - minx) >= maxx) no_bounce_x_end = EINA_TRUE;
|
||||||
}
|
}
|
||||||
if (!sid->bounce_vert)
|
if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_vert)
|
||||||
{
|
{
|
||||||
if (y <= miny) no_bounce_y_end = EINA_TRUE;
|
if (y <= miny) no_bounce_y_end = EINA_TRUE;
|
||||||
if ((y - miny) >= maxy) no_bounce_y_end = EINA_TRUE;
|
if ((y - miny) >= maxy) no_bounce_y_end = EINA_TRUE;
|
||||||
|
|
Loading…
Reference in New Issue