Merge lp:~3v1n0/unity/bfb-drag-fix-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

Launcher: start the drag icon request from the original mouse-down position.

When dragging an icon, the start position should be set to the initial mouse position, not to the current mouse position so that it won't happen that an icon different to the one that has been pressed is going to be dragged.

Manual test included.

[Tim Penhey (thumper)]

Can you confirm the revision of lp:unity that this is backporting the fix from?

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

The fix has not been pushed in trunk yet, since I'm working on this on a separate branch.

[Tim Penhey (thumper)]

I think the general process is to wait until in trunk before putting in 5.0.

I'll approve this, but wait for the other to land first :)

review: Approve

[Andrea Azzarone (azzar1)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1377/console reported an error when processing this lp:~3v1n0/unity/bfb-drag-fix-5.0 branch.
Not merging it.

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-08-03 19:55:42 +0000
+++ manual-tests/Launcher.txt	2012-08-11 12:00:26 +0000
@@ -169,6 +169,21 @@
   it, and the any pips for running apps show again.
 
 
+Dragging fixed icons does not reorder an icon above or below
+------------------------------------------------------------
+This test is about not reordering when dragging fixed icons.
+
+#. Move the mouse so it is over the BFB launcher icon
+#. Press and hold the mouse button
+#. Try to drag the icon to the right of the launcher.
+#. Move the mouse down at least to the height of the second launcher icon
+   keeping the mouse pressed.
+#. Release
+
+Outcome:
+  * No icon should be dragged.
+
+
 Dragged launcher icons out of the launcher are properly drawn
 -------------------------------------------------------------
 This test ensures that the launcher icons out of the launcher are properly drawn

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-08-03 19:55:42 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-08-11 12:00:26 +0000
@@ -2392,7 +2392,14 @@
     }
     else
     {
-      StartIconDragRequest(x, y);
+      // We we can safely start the icon drag, from the original mouse-down position
+      if (_start_dragicon_handle > 0)
+      {
+        g_source_remove(_start_dragicon_handle);
+        _start_dragicon_handle = 0;
+      }
+
+      StartIconDragRequest(x - _dnd_delta_x, y - _dnd_delta_y);
     }
   }
   else if (GetActionState() == ACTION_DRAG_LAUNCHER)