Merge lp:~mzanetti/unity8/fix-dnd-cancelling into lp:unity8

[Michael Zanetti]

Make sure dnd mode is ended properly when drag gesture is cancelled

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes
 * Did you make sure that your branch does not contain spurious tags?
yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1731
http://jenkins.qa.ubuntu.com/job/unity8-ci/5559/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/724
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/724
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2000/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2275
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2275/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19698

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5559/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

On second drag of the same item (after it was cancelled) the item is not under my finger but seems to be displaced by the old position it was in.

review: Needs Fixing

[lp:~mzanetti/unity8/fix-dnd-cancelling]

1732. By Michael Zanetti on 2015-04-17

also reset drag.target

[Albert Astals Cid (aacid)]

Still needs some work, i was doing a vertical move of the dragged icon while doing the horizontal swipe in the greeter to cancel it and ended up with this

http://imgur.com/87eRnos

review: Needs Fixing

[lp:~mzanetti/unity8/fix-dnd-cancelling]

1733. By Michael Zanetti on 2015-04-17

do the full endDrag procedure in case of a cancel

[Michael Zanetti (mzanetti)]

> Still needs some work, i was doing a vertical move of the dragged icon while
> doing the horizontal swipe in the greeter to cancel it and ended up with this
>
> http://imgur.com/87eRnos

Should be fixed now. I can't repro it any more.

[lp:~mzanetti/unity8/fix-dnd-cancelling]

1734. By Michael Zanetti on 2015-04-17

coding style

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
They passed locally, waiting for CI before top approving

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1732
http://jenkins.qa.ubuntu.com/job/unity8-ci/5567/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2310/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/732
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2028/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19746

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5567/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-02-05 14:03:32 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-04-17 13:31:44 +0000
@@ -338,12 +338,14 @@
                         }
 
                         onCanceled: {
-                            selectedItem = undefined;
-                            preDragging = false;
-                            postDragging = false;
+                            endDrag();
                         }
 
                         onReleased: {
+                            endDrag();
+                        }
+
+                        function endDrag() {
                             var droppedIndex = draggedIndex;
                             if (dragging) {
                                 postDragging = true;
 
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-03-13 14:32:45 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-04-17 13:31:44 +0000
@@ -459,6 +459,38 @@
             waitUntilLauncherDisappears();
         }
 
+        function test_dragndrop_cancel() {
+            dragLauncherIntoView();
+            var draggedItem = findChild(launcher, "launcherDelegate4")
+            var item0 = findChild(launcher, "launcherDelegate0")
+            var fakeDragItem = findChild(launcher, "fakeDragItem")
+
+            // Doing longpress
+            var currentMouseX = draggedItem.width / 2
+            var currentMouseY = draggedItem.height / 2
+            mousePress(draggedItem, currentMouseX, currentMouseY)
+            // DraggedItem needs to hide and fakeDragItem become visible
+            tryCompare(draggedItem, "itemOpacity", 0)
+            tryCompare(fakeDragItem, "visible", true)
+
+            // Dragging
+            currentMouseX -= units.gu(20)
+            mouseMove(draggedItem, currentMouseX, currentMouseY)
+
+            // Make sure we're in the dragging state
+            var dndArea = findChild(launcher, "dndArea");
+            tryCompare(draggedItem, "dragging", true)
+            tryCompare(dndArea, "draggedIndex", 4)
+
+            // Tap somewhere in the middle of the screen to close/hide the launcher
+            tap(root)
+
+            // Make sure the dnd operation has been stopped
+            tryCompare(draggedItem, "dragging", false)
+            tryCompare(dndArea, "draggedIndex", -1)
+            tryCompare(dndArea, "drag.target", undefined)
+        }
+
         function test_quicklist_dismiss() {
             dragLauncherIntoView();
             var draggedItem = findChild(launcher, "launcherDelegate5")