Merge lp:~azzar1/unity/fix-987223-5.0 into lp:unity/5.0

[Andrea Azzarone]

Backport lp:~andyrock/unity/fix-987223

== Problem ==
Launcher doesn't autoscroll when holding an icon (can't reach trash)

== Fix ==
Don't use _scroll_limit_reached. _launcher_drag_delta_max and _launcher_drag_delta_min should be just fine.

== Test ==
Manual test added.

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-07-26 04:38:01 +0000
+++ manual-tests/Launcher.txt	2012-08-03 17:05:27 +0000
@@ -601,3 +601,15 @@
 Expected Results:
  * All the valid drop icons should unfold during the drag and drop.
 
+
+Test launcher autoscrolls when holding an icon
+----------------------------------------------
+Setup:
+ * Add icons to the laucnher so that some of them in the bottom are folded.
+
+Actions:
+ * Drag a launcher icon of the top side of the launcher. Don't release the mouse.
+ * Move the mouse at the bottom of the launcher.
+
+Expected Results:
+ * The launcher should autoscroll so you can reach the trash icon.
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-07-26 04:27:23 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-08-03 17:05:27 +0000
@@ -140,6 +140,8 @@
 Launcher::Launcher(nux::BaseWindow* parent,
                    NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , _launcher_drag_delta_max(0)
+  , _launcher_drag_delta_min(0)
   , _model(0)
   , _collection_window(NULL)
   , _background_color(nux::color::DimGray)
@@ -200,7 +202,6 @@
   _folded_angle           = 1.0f;
   _neg_folded_angle       = -1.0f;
   _space_between_icons    = 5;
-  _last_delta_y           = 0.0f;
   _folded_z_distance      = 10.0f;
   _launcher_action_state  = ACTION_NONE;
   _icon_under_mouse       = NULL;
@@ -225,7 +226,6 @@
   _shortcuts_shown        = false;
   _hovered                = false;
   _hidden                 = false;
-  _scroll_limit_reached   = false;
   _render_drag_window     = false;
   _drag_edge_touching     = false;
   _steal_drag             = false;
@@ -1202,28 +1202,28 @@
   last_geo = box_geo;
   _enter_y = 0;
 
+  // logically dnd exit only restores to the clamped ranges
+  // hover_progress restores to 0
+  _launcher_drag_delta_max = 0.0f;
+  _launcher_drag_delta_min = std::min(0.0f, launcher_height - sum);
+
   if (hover_progress > 0.0f && _launcher_drag_delta != 0)
   {
     float delta_y = _launcher_drag_delta;
 
-    // logically dnd exit only restores to the clamped ranges
-    // hover_progress restores to 0
-    float max = 0.0f;
-    float min = MIN(0.0f, launcher_height - sum);
-
-    if (_launcher_drag_delta > max)
-      delta_y = max + DragLimiter(delta_y - max);
-    else if (_launcher_drag_delta < min)
-      delta_y = min + DragLimiter(delta_y - min);
+    if (_launcher_drag_delta > _launcher_drag_delta_max)
+      delta_y = _launcher_drag_delta_max + DragLimiter(delta_y - _launcher_drag_delta_max);
+    else if (_launcher_drag_delta < _launcher_drag_delta_min)
+      delta_y = _launcher_drag_delta_min + DragLimiter(delta_y - _launcher_drag_delta_min);
 
     if (GetActionState() != ACTION_DRAG_LAUNCHER)
     {
       float dnd_progress = DnDExitProgress(current);
 
-      if (_launcher_drag_delta > max)
-        delta_y = max + (delta_y - max) * dnd_progress;
-      else if (_launcher_drag_delta < min)
-        delta_y = min + (delta_y - min) * dnd_progress;
+      if (_launcher_drag_delta > _launcher_drag_delta_max)
+        delta_y = _launcher_drag_delta_max + (delta_y - _launcher_drag_delta_max) * dnd_progress;
+      else if (_launcher_drag_delta < _launcher_drag_delta_min)
+        delta_y = _launcher_drag_delta_min + (delta_y - _launcher_drag_delta_min) * dnd_progress;
 
       if (dnd_progress == 0.0f)
         _launcher_drag_delta = (int) delta_y;
@@ -1232,9 +1232,6 @@
     delta_y *= hover_progress;
     center.y += delta_y;
     folding_threshold += delta_y;
-
-    _scroll_limit_reached = (delta_y == _last_delta_y);
-    _last_delta_y = delta_y;
   }
   else
   {
@@ -1729,44 +1726,46 @@
 gboolean Launcher::OnScrollTimeout(gpointer data)
 {
   Launcher* self = (Launcher*) data;
-  nux::Geometry geo = self->GetGeometry();
-  gboolean anim = TRUE;
+  gboolean continue_animation = TRUE;
 
-  //
-  // Always check _scroll_limit_reached to ensure we don't keep spinning
-  // this timer if the mouse happens to be left idle over one of the autoscroll
-  // hotspots on the launcher.
-  //
   if (self->IsInKeyNavMode() || !self->_hovered ||
-      self->_scroll_limit_reached ||
       self->GetActionState() == ACTION_DRAG_LAUNCHER)
-    anim = FALSE;
+  {
+    continue_animation = FALSE;
+  }
   else if (self->MouseOverTopScrollArea())
   {
-    if (self->MouseOverTopScrollExtrema())
+    if (self->_launcher_drag_delta >= self->_launcher_drag_delta_max)
+      continue_animation = FALSE;
+    else if (self->MouseOverTopScrollExtrema())
       self->_launcher_drag_delta += 6;
     else
       self->_launcher_drag_delta += 3;
   }
   else if (self->MouseOverBottomScrollArea())
   {
-    if (self->MouseOverBottomScrollExtrema())
+    if (self->_launcher_drag_delta <= self->_launcher_drag_delta_min)
+      continue_animation = FALSE;
+    else if (self->MouseOverBottomScrollExtrema())
       self->_launcher_drag_delta -= 6;
     else
       self->_launcher_drag_delta -= 3;
   }
   else
-    anim = FALSE;
+  {
+    continue_animation = FALSE;
+  }
 
-  if (anim)
+  if (continue_animation != FALSE)
+  {
     self->EnsureAnimation();
+  }
   else
   {
     self->_autoscroll_handle = 0;
-    self->_scroll_limit_reached = false;
   }
 
-  return anim;
+  return continue_animation;
 }
 
 void Launcher::EnsureScrollTimer()
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2012-07-26 04:27:23 +0000
+++ plugins/unityshell/src/Launcher.h	2012-08-03 17:05:27 +0000
@@ -359,6 +359,8 @@
   int _postreveal_mousemove_delta_x;
   int _postreveal_mousemove_delta_y;
   int _launcher_drag_delta;
+  int _launcher_drag_delta_max;
+  int _launcher_drag_delta_min;
   int _enter_y;
   int _last_button_press;
   int _drag_out_id;