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

[Andrea Azzarone]

Fix launcher autoscroll during dnd.

== 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.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2494
http://jenkins.qa.ubuntu.com/job/unity-ci/73/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/73/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/73/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2494
http://jenkins.qa.ubuntu.com/job/unity-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/80/console

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Looks good and works :).

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-16 01:08:04 +0000
+++ launcher/Launcher.cpp	2012-07-16 08:13:38 +0000
@@ -111,7 +111,6 @@
   , _active_quicklist(nullptr)
   , _hovered(false)
   , _hidden(false)
-  , _scroll_limit_reached(false)
   , _render_drag_window(false)
   , _shortcuts_shown(false)
   , _data_checked(false)
@@ -122,7 +121,6 @@
   , _folded_angle(1.0f)
   , _neg_folded_angle(-1.0f)
   , _folded_z_distance(10.0f)
-  , _last_delta_y(0.0f)
   , _edge_overcome_pressure(0.0f)
   , _launcher_action_state(ACTION_NONE)
   , _space_between_icons(5)
@@ -135,6 +133,8 @@
   , _postreveal_mousemove_delta_x(0)
   , _postreveal_mousemove_delta_y(0)
   , _launcher_drag_delta(0)
+  , _launcher_drag_delta_max(0)
+  , _launcher_drag_delta_min(0)
   , _enter_y(0)
   , _last_button_press(0)
   , _drag_out_id(0)
@@ -1071,22 +1071,22 @@
 
     // 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);
+    _launcher_drag_delta_max = 0.0f;
+    _launcher_drag_delta_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;
@@ -1095,9 +1095,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
   {
@@ -1589,26 +1586,25 @@
 {
   bool 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 (IsInKeyNavMode() || !_hovered || _scroll_limit_reached ||
+  if (IsInKeyNavMode() || !_hovered ||
       GetActionState() == ACTION_DRAG_LAUNCHER)
   {
     continue_animation = false;
   }
   else if (MouseOverTopScrollArea())
   {
-    if (MouseOverTopScrollExtrema())
+    if (_launcher_drag_delta >= _launcher_drag_delta_max)
+      continue_animation = false;
+    else if (MouseOverTopScrollExtrema())
       _launcher_drag_delta += 6;
     else
       _launcher_drag_delta += 3;
   }
   else if (MouseOverBottomScrollArea())
   {
-    if (MouseOverBottomScrollExtrema())
+    if (_launcher_drag_delta <= _launcher_drag_delta_min)
+      continue_animation = false;
+    else if (MouseOverBottomScrollExtrema())
       _launcher_drag_delta -= 6;
     else
       _launcher_drag_delta -= 3;
@@ -1622,10 +1618,6 @@
   {
     EnsureAnimation();
   }
-  else
-  {
-    _scroll_limit_reached = false;
-  }
 
   return continue_animation;
 }

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-07-12 19:01:51 +0000
+++ launcher/Launcher.h	2012-07-16 08:13:38 +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;

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-07-10 15:51:59 +0000
+++ manual-tests/Launcher.txt	2012-07-16 08:13:38 +0000
@@ -623,3 +623,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.