(upstream merge r63539)
git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63539
7cbeb6ba-43b4-40fd-8cce-
4c39aea84d33
Conflicts:
src/lib/els_scroller.c
- if (sd->down.hold_animator)
- {
- ecore_animator_del(sd->down.hold_animator);
- sd->down.hold_animator = NULL;
- }
if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
}
}
if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
}
}
- if (sd->down.hold_animator)
- {
- ecore_animator_del(sd->down.hold_animator);
- sd->down.hold_animator = NULL;
- }
+ }
+ if (sd->down.hold_animator)
+ {
+ ecore_animator_del(sd->down.hold_animator);
+ sd->down.hold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);