enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

In case of scroll in scroll, the outside scroller shouldn't be scrolled if the inside scroller can be scrolled. 

SVN revision: 72064
This commit is contained in:
Jaehwan Kim 2012-06-13 07:01:00 +00:00
parent 5ccf4d4d24
commit e828e20bb7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2081,7 +2081,8 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev
oy = -sd->down.dy;
if (!_smart_do_page(sd))
{
if ((!sd->down.momentum_animator) && (!sd->momentum_animator_disabled))
if ((!sd->down.momentum_animator) && (!sd->momentum_animator_disabled) &&
(sd->widget) && (!elm_widget_drag_child_locked_y_get(sd->widget)))
{
sd->down.momentum_animator = ecore_animator_add(_smart_momentum_animator, sd);
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL;