Merge lp:~unity-team/unity/unity.post-release-fixes into lp:unity

[Gord Allott]

some small fixes for the scrolling update,
Work correctly when you don't have enough icons to fill the launcher (neil mode)
stop auto-scrolling when you are already dragging the launcher

[Mirco Müller (macslow)]

I get a jerking animation when right-clicking on a launcher icon to get to the quicklist. Instead of directly expanding from the tooltip to the quicklist, it looks like the tooltip closes, reopens and then expands to the quicklist. Furthermore I'm getting duplicated entries in the quicklist, but that's another issue I believe.

review: Needs Fixing

=== modified file 'unity-private/launcher/scroller-view.vala'
--- unity-private/launcher/scroller-view.vala	2010-08-26 15:34:34 +0000
+++ unity-private/launcher/scroller-view.vala	2010-08-31 10:13:44 +0000
@@ -82,6 +82,7 @@
     private ScrollerViewType view_type = ScrollerViewType.CONTRACTED;
     private bool do_logic_pick = true;
     private float last_known_pointer_x = 0.0f;
+    private bool can_scroll = false;
 
     /*
      * scrolling variables
@@ -409,7 +410,6 @@
 
     private void on_drag_indicator_index_change ()
     {
-      //debug (@"index changed $drag_indicator_index");
       order_children (false);
       queue_relayout ();
     }
@@ -678,7 +678,15 @@
           new_scroll_position = limit * ( 1 - Math.powf ((limit - 1) / limit, new_scroll_position));
           scroll_position = new_scroll_position;
         }
-      else if (scroll_position < -(get_total_children_height () - get_available_height ()))
+      else if (get_total_children_height () < get_available_height () &&
+               scroll_position < 0)
+        {
+          float new_scroll_position = -scroll_position;
+          new_scroll_position = limit * ( 1 - Math.powf ((limit - 1) / limit, new_scroll_position));
+          scroll_position = -new_scroll_position;
+        }
+      else if (get_total_children_height () >= get_available_height () &&
+               scroll_position < -(get_total_children_height () - get_available_height ()))
         {
           float diff = scroll_position + (get_total_children_height () - get_available_height ());
           float new_scroll_position = limit * ( 1 - Math.powf ((limit - 1) / limit, Math.fabsf (diff)));
@@ -845,6 +853,11 @@
           passthrough_button_press_event (event);
         }
       button_down = true;
+      if (get_model_index_at_y_pos (event.button.y, true) < 0)
+        can_scroll = false;
+      else
+        can_scroll = true;
+
       previous_y_position = event.button.y;
       previous_y_time = event.button.time;
 
@@ -864,6 +877,7 @@
       button_down = false;
       this.get_stage ().button_release_event.disconnect (this.on_button_release_event);
       Unity.global_shell.remove_fullscreen_request (this);
+      Clutter.ungrab_pointer ();
 
       if (is_scrolling)
         {
@@ -879,10 +893,7 @@
           if (scroll_position > 0 || scroll_position < -(get_total_children_height () - get_available_height ()))
             {
               current_phase = ScrollerPhase.SETTLING;
-              if (scroll_position > 0)
-                settle_position = 0;
-              else
-                settle_position = -(get_total_children_height () - get_available_height ());
+              settle_position = get_aligned_settle_position ();
             }
           else
             {
@@ -950,7 +961,7 @@
     float autoscroll_mouse_pos_cache = 0.0f;
     private bool on_autoscroll_motion_check (float y)
     {
-      if (get_total_children_height () < get_available_height ())
+      if (get_total_children_height () < get_available_height () || is_scrolling)
         {
           is_autoscrolling = false;
         }
@@ -996,7 +1007,9 @@
       }
       last_motion_event_time = event.motion.time;
 
-      if (button_down && is_scrolling == false && view_type != ScrollerViewType.CONTRACTED)
+      if (button_down && is_scrolling == false &&
+          view_type != ScrollerViewType.CONTRACTED &&
+          can_scroll)
         {
           /* we have a left button down, but we aren't dragging yet, we need to
            * monitor how far away we have dragged from the original click, once
@@ -1143,10 +1156,7 @@
           fling_timeout_source = GLib.Timeout.add (300, () =>
             {
               current_phase = ScrollerPhase.SETTLING;
-              if (scroll_position > 0)
-                settle_position = 0;
-              else
-                settle_position = -(get_total_children_height () - get_available_height ());
+              settle_position = get_aligned_settle_position ();
               fling_timeline.start ();
               return false;
             });
@@ -1175,10 +1185,14 @@
           // we always position on the first child
           final_position = 0;
         }
+      else if (get_total_children_height () < get_available_height ())
+        {
+          final_position = 0;
+        }
       else if (-scroll_position > total_child_height - height - padding.top - padding.bottom)
         {
           // position on the final child
-          final_position = total_child_height - height + padding.bottom;
+          final_position = -(get_total_children_height () - get_available_height ());
         }
 
       return final_position;
@@ -1602,7 +1616,6 @@
 
       if (drag_indicator_active)
         {
-          //debug (@"drawing at $drag_indicator_position with $drag_indicator_opacity opacity");
           Cogl.set_source_color4f (1.0f, 1.0f, 1.0f,
                                    drag_indicator_opacity);
 

=== modified file 'unity-private/launcher/scrollerchild-controller.vala'
--- unity-private/launcher/scrollerchild-controller.vala	2010-08-26 11:53:42 +0000
+++ unity-private/launcher/scrollerchild-controller.vala	2010-08-31 10:13:44 +0000
@@ -140,26 +140,28 @@
     private bool on_release_event (Clutter.Event event)
     {
       child.grabbed_push = 0;
-      if (event.button.button == 1 &&
-          button_down == true &&
-          event.button.time - last_press_time < 500 &&
-          no_activate == false)
+      if (event.button.button == 1)
         {
-          if (menu is QuicklistController)
+          if (button_down == true &&
+              event.button.time - last_press_time < 500 &&
+              no_activate == false)
             {
-              if (menu.state == QuicklistControllerState.LABEL ||
-                  menu.state == QuicklistControllerState.MENU)
-              {
-                menu.state = QuicklistControllerState.CLOSED;
-              }
-            }
+              if (menu is QuicklistController)
+                {
+                  if (menu.state == QuicklistControllerState.LABEL ||
+                      menu.state == QuicklistControllerState.MENU)
+                  {
+                    menu.state = QuicklistControllerState.CLOSED;
+                  }
+                }
 
-          activate ();
-        }
-      else
-        {
-          menu.state = QuicklistControllerState.LABEL;
-          ensure_menu_state ();
+              activate ();
+            }
+          else
+            {
+              menu.state = QuicklistControllerState.LABEL;
+              ensure_menu_state ();
+            }
         }
 
       button_down = false;
@@ -215,8 +217,11 @@
         {
           Idle.add (() =>
             {
-              menu.state = QuicklistControllerState.MENU;
-              menu_state = ScrollerChildControllerMenuState.NO_MENU;
+              if (menu.state != QuicklistControllerState.MENU)
+                {
+                  menu.state = QuicklistControllerState.MENU;
+                }
+              //menu_state = ScrollerChildControllerMenuState.NO_MENU;
               return false;
             });
         }