Merge lp:~unity-team/unity/unity.gord-design-launcher-bug-fixes into lp:unity

[Gord Allott]

Fixes a whole bunch of design bugs, hopefully launchpad is being smart and has linked them

[Mikkel Kamstrup Erlandsen (kamstrup)]

CODE:
Can you please convert this to keep us all sane :-) :

  - (get_total_children_height () - get_available_height ())
 |
 V
  get_available_height () - get_total_children_height ()

If you only used 'QuicklistController? attached_menu' in on_menu_close() i'd maybe let you get away with inline declarations like this, but it appears you access it from other methods as well. Please move that declaration to the class header.

It should definitely give more than 20 exp to defeat Unity. I am thinking 1021 is a good number (it's a prime close to 1024 so you gotta love it!)

FUNCTIONAL:
Bug #631443: Launcher tile dragging shouldn't be masked
 - I can still see a tiny bit of clipping when dragging off the launcher, but much better than before

Bug #631452: Launcher tile vertical dragging
 - Dragging feels much more natural, and the white drop indicator matches my expectations as a user much better

Bug #632079: launcher shouldn't 'fold' when hovering on a quicklist
 - Fixed

Bug #632991: launcher mouse wheel dragging elastic band jittering
 - Fixed

Bug #633045: launcher auto-scroll speed
 - Autoscrolling feels much more useful now. Fixed

THE VERDICT
Approved! Nice work! :-D

review: Approve

=== modified file 'unity-private/launcher/quicklist-controller.vala'
--- unity-private/launcher/quicklist-controller.vala	2010-09-13 10:17:19 +0000
+++ unity-private/launcher/quicklist-controller.vala	2010-09-14 11:52:42 +0000
@@ -124,6 +124,9 @@
     private void new_menu ()
     {
       menu = new QuicklistMenu () as Ctk.MenuExpandable;
+      menu.destroy.connect (() => {
+        state = QuicklistControllerState.CLOSED;
+      });
       if (Unity.global_shell is Unity.Shell)
         {
           menu.destroy.connect (() => {

=== modified file 'unity-private/launcher/scroller-controller.vala'
--- unity-private/launcher/scroller-controller.vala	2010-09-02 10:59:35 +0000
+++ unity-private/launcher/scroller-controller.vala	2010-09-14 11:52:42 +0000
@@ -351,7 +351,8 @@
 
           // if the actor is not in the model, add it. because its now in there!
           // find the index at this position
-          int model_index = view.get_model_index_at_y_pos_no_anim (y, true);
+
+          int model_index = view.get_model_index_at_y_pos_no_anim (y - 24, true);
           if (model_index < 0) return;
 
           //we have to check to see if we would still be over the index

=== modified file 'unity-private/launcher/scroller-view.vala'
--- unity-private/launcher/scroller-view.vala	2010-09-01 13:28:11 +0000
+++ unity-private/launcher/scroller-view.vala	2010-09-14 11:52:42 +0000
@@ -663,36 +663,43 @@
     }
 
     // will move the scroller by the given pixels
-    private void move_scroll_position (float pixels, bool check_bounds=false, float limit = 160.0f)
+    private float calculate_scroll_position (bool check_bounds=false, float limit = 160.0f)
     {
-      scroll_position += pixels;
-      float old_scroll_position = scroll_position;
+      float new_scroll_position = scroll_position;
       if (check_bounds)
         {
-          scroll_position = Math.fminf (scroll_position, 0);
-          scroll_position = Math.fmaxf (scroll_position, - (get_total_children_height () - get_available_height ()));
+          new_scroll_position = Math.fminf (new_scroll_position, 0);
+          new_scroll_position = Math.fmaxf (new_scroll_position, - (get_total_children_height () - get_available_height ()));
         }
-      else if (scroll_position > 0)
+      else if (new_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 < 0)
+               new_scroll_position < 0)
         {
-          float new_scroll_position = -scroll_position;
+          new_scroll_position = -new_scroll_position;
           new_scroll_position = limit * ( 1 - Math.powf ((limit - 1) / limit, new_scroll_position));
-          scroll_position = -new_scroll_position;
+          new_scroll_position = -new_scroll_position;
         }
       else if (get_total_children_height () >= get_available_height () &&
-               scroll_position < -(get_total_children_height () - get_available_height ()))
+               new_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)));
+          float diff = new_scroll_position + (get_total_children_height () - get_available_height ());
+          new_scroll_position = limit * ( 1 - Math.powf ((limit - 1) / limit, Math.fabsf (diff)));
           new_scroll_position = -(get_total_children_height () - get_available_height ()) - new_scroll_position;
-          scroll_position = new_scroll_position;
         }
+
+      return new_scroll_position;
+    }
+
+    private void move_scroll_position (float pixels, bool check_bounds=false, float limit = 160.0f)
+    {
+      scroll_position += pixels;
+      float old_scroll_position = scroll_position;
+
+      scroll_position = calculate_scroll_position (check_bounds, limit);
+
       order_children (true);
       queue_relayout ();
 
@@ -826,8 +833,9 @@
       if (autoscroll_anim_active == false && is_autoscrolling)
       {
         Timeout.add (33, () => {
-          float speed = 12.0f - autoscroll_mouse_pos_cache;
+          float speed = 12.0f - Math.fabsf (autoscroll_mouse_pos_cache);
           speed /= 12.0f;
+          speed *= 30;
           speed *= autoscroll_direction;
           move_scroll_position (speed, true);
           autoscroll_anim_active = is_autoscrolling;
@@ -920,6 +928,12 @@
           queue_contract_launcher = 0;
         }
 
+      if (attached_menu is QuicklistController)
+        {
+          attached_menu.notify["status"].disconnect (on_menu_close);
+          attached_menu = null;
+        }
+
       expand_launcher (event.crossing.y);
       return false;
     }
@@ -941,12 +955,41 @@
       return false;
     }
 
+    QuicklistController? attached_menu = null;
+    private void on_menu_close ()
+    {
+      if (attached_menu is QuicklistController)
+        {
+          if (attached_menu.state != QuicklistControllerState.MENU)
+            {
+              if (last_known_pointer_x > get_width ())
+                do_queue_contract_launcher ();
+
+              attached_menu.notify["status"].disconnect (on_menu_close);
+              attached_menu = null;
+            }
+        }
+    }
+
     private bool on_leave_event (Clutter.Event event)
     {
       last_known_pointer_x = 200;
       var drag_controller = Drag.Controller.get_default ();
       if (drag_controller.is_dragging) return false;
       if (is_scrolling) return false;
+
+      // if a menu is open, don't fold the launcher, wait until its closed (if ever)
+      QuicklistController? menu = QuicklistController.get_current_menu ();
+      if (menu is QuicklistController)
+        {
+          if (menu.state == QuicklistControllerState.MENU)
+            {
+              attached_menu = menu;
+              attached_menu.notify["state"].connect (on_menu_close);
+              return false;
+            }
+          }
+
       do_queue_contract_launcher ();
 
       if (last_picked_actor is Clutter.Actor &&
@@ -1129,9 +1172,10 @@
     private void do_anim_settle (Clutter.Timeline timeline, int msecs)
     {
       var distance = settle_position - scroll_position;
-      move_scroll_position (distance * 0.2f);
+      move_scroll_position (distance * 0.2f, false, 60.0f);
       if (Math.fabs (distance) < 1 )
         {
+          move_scroll_position (distance);
           current_phase = ScrollerPhase.NONE;
         }
 

=== modified file 'unity-private/launcher/scrollerchild-controller.vala'
--- unity-private/launcher/scrollerchild-controller.vala	2010-08-31 10:11:05 +0000
+++ unity-private/launcher/scrollerchild-controller.vala	2010-09-14 11:52:42 +0000
@@ -59,7 +59,7 @@
     construct
     {
       theme_file_path = new Unity.ThemeFilePath ();
-      name = "Bug Found, You Defeated Unity";
+      name = "Bug Found, You Defeated Unity, +20 exp";
       child.controller = this;
       child.button_press_event.connect (on_press_event);
       child.button_release_event.connect (on_release_event);
@@ -106,12 +106,12 @@
     private bool on_leave_event (Clutter.Event event)
     {
       button_down = false;
+      menu_state = ScrollerChildControllerMenuState.NO_MENU;
       if (menu_state != ScrollerChildControllerMenuState.MENU)
         {
-          menu_state = ScrollerChildControllerMenuState.NO_MENU;
+          ensure_menu_state ();
         }
 
-      ensure_menu_state ();
       return false;
     }
     private bool no_activate = false;
@@ -199,7 +199,7 @@
         {
           // there is a menu open already, attach to the destroy so we can
           // re-ensure later
-          QuicklistController.get_current_menu ().get_view ().destroy.connect (ensure_menu_state);
+          //QuicklistController.get_current_menu ().get_view ().destroy.connect (ensure_menu_state);
           return;
         }