make sure scroller flings after a launcher pops out

(bzr r433.6.7)

2 files changed, 7 insertions, 10 deletions

diff --git a/unity-private/launcher/scroller-view.vala b/unity-private/launcher/scroller-view.vala
index b3bd1e08c..37d13a3fd 100644
--- a/unity-private/launcher/scroller-view.vala
+++ b/unity-private/launcher/scroller-view.vala
@@ -193,6 +193,8 @@ namespace Unity.Launcher
 is_scrolling = false;
 Clutter.ungrab_pointer ();
 get_stage ().motion_event.disconnect (on_motion_event);
+ current_phase = ScrollerPhase.FLUNG;
+ fling_timeline.start ();
 
 animate (Clutter.AnimationMode.EASE_OUT_SINE, 150,
 "drag-indicator-opacity", 1.0f);
@@ -1468,14 +1470,6 @@ namespace Unity.Launcher
 if (!child.do_not_render) ;
 child.allocate (child_box, flags);
 
-/*
- child.remove_clip ();
- if (child_box.y1 < 0)
- child.set_clip (0, Math.fabsf (child_box.y1),
- child_box.get_width (), child_box.get_height () - child_box.y1);
-*/
-
-
 total_child_height += child_height + spacing;
 
 if (index >= 0 && index <= 9)
diff --git a/unity-private/launcher/scrollerchild-controller.vala b/unity-private/launcher/scrollerchild-controller.vala
index e0e520ba5..e187fcbdd 100644
--- a/unity-private/launcher/scrollerchild-controller.vala
+++ b/unity-private/launcher/scrollerchild-controller.vala
@@ -227,8 +227,11 @@ namespace Unity.Launcher
 if (button_down && drag_controller.is_dragging == false && can_drag ())
 {
 float diff = Math.fabsf (event.motion.x - click_start_pos_x);
- child.grabbed_push = Math.powf (diff, 0.5f);
- child.queue_relayout ();
+ if (event.motion.x - click_start_pos_x > 0)
+ {
+ child.grabbed_push = Math.powf (diff, 0.5f);
+ child.queue_relayout ();
+ }
 if (diff > drag_sensitivity)
 {
 child.grabbed_push = 0;