Merge lp:~aacid/unity8/drag_with_quicklist into lp:unity8

[Albert Astals Cid]

Allow dragging launcher items with the quicklist open

 * Are there any related MPs required for this MP to build/function as expected?
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

[Michael Zanetti (mzanetti)]

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

yes

 * Did CI run pass? If not, please explain why.

 not yet. waiting with top approval

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2075
http://jenkins.qa.ubuntu.com/job/unity8-ci/6873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5567
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/288/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1584
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5581
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5581/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25765
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/105/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25764

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Steps:
* long-press on icon a)
* long-press on icon b)

Expected:
* there's an animation when quicklist closes on a) and opens on b)

Current:
* quicklist moves from a) to b) abruptly

review: Needs Information

[Albert Astals Cid (aacid)]

> Steps:
> * long-press on icon a)
> * long-press on icon b)
>
> Expected:
> * there's an animation when quicklist closes on a) and opens on b)
>
> Current:
> * quicklist moves from a) to b) abruptly

That's the same behaviour that happens when right clicking on the launcher when the quicklist is open nowadays. I agree probably the animation looks nicer but not sure it should be part of this bugfix since what I'm doing here is just bring the "pressandhold" behaviour to be the same as the "right click" behaviour.

What do you think, should I try fix both scenarios so that the animations takes place as part of this MR or open a bug about it for the future?

[Michał Sawicz (saviq)]

Fine with me.

review: Abstain

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-11-26 13:51:53 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-12-03 10:50:28 +0000
@@ -384,7 +384,11 @@
                         property int startY
 
                         onPressed: {
-                            selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)
+                            processPress(mouse);
+                        }
+
+                        function processPress(mouse) {
+                            selectedItem = launcherListView.itemAt(mouse.x, mouse.y + launcherListView.realContentY)
                         }
 
                         onClicked: {
@@ -429,14 +433,14 @@
                         }
 
                         onCanceled: {
-                            endDrag();
+                            endDrag(drag);
                         }
 
                         onReleased: {
-                            endDrag();
+                            endDrag(drag);
                         }
 
-                        function endDrag() {
+                        function endDrag(dragItem) {
                             var droppedIndex = draggedIndex;
                             if (dragging) {
                                 postDragging = true;
@@ -452,7 +456,7 @@
                             selectedItem = undefined;
                             preDragging = false;
 
-                            drag.target = undefined
+                            dragItem.target = undefined
 
                             progressiveScrollingTimer.stop();
                             launcherListView.interactive = true;
@@ -464,13 +468,17 @@
                         }
 
                         onPressAndHold: {
+                            processPressAndHold(mouse, drag);
+                        }
+
+                        function processPressAndHold(mouse, dragItem) {
                             if (Math.abs(selectedItem.angle) > 30) {
                                 return;
                             }
 
                             Haptics.play();
 
-                            draggedIndex = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);
+                            draggedIndex = Math.floor((mouse.y + launcherListView.realContentY) / launcherListView.realItemHeight);
 
                             // Opening QuickList
                             quickList.item = selectedItem;
@@ -480,26 +488,30 @@
 
                             launcherListView.interactive = false
 
-                            var yOffset = draggedIndex > 0 ? (mouseY + launcherListView.realContentY) % (draggedIndex * launcherListView.realItemHeight) : mouseY + launcherListView.realContentY
+                            var yOffset = draggedIndex > 0 ? (mouse.y + launcherListView.realContentY) % (draggedIndex * launcherListView.realItemHeight) : mouse.y + launcherListView.realContentY
 
                             fakeDragItem.iconName = launcherListView.model.get(draggedIndex).icon
                             fakeDragItem.x = units.gu(0.5)
-                            fakeDragItem.y = mouseY - yOffset + launcherListView.anchors.topMargin + launcherListView.topMargin
+                            fakeDragItem.y = mouse.y - yOffset + launcherListView.anchors.topMargin + launcherListView.topMargin
                             fakeDragItem.angle = selectedItem.angle * (root.inverted ? -1 : 1)
                             fakeDragItem.offset = selectedItem.offset * (root.inverted ? -1 : 1)
                             fakeDragItem.count = LauncherModel.get(draggedIndex).count
                             fakeDragItem.progress = LauncherModel.get(draggedIndex).progress
                             fakeDragItem.flatten()
-                            drag.target = fakeDragItem
+                            dragItem.target = fakeDragItem
 
-                            startX = mouseX
-                            startY = mouseY
+                            startX = mouse.x
+                            startY = mouse.y
                         }
 
                         onPositionChanged: {
+                            processPositionChanged(mouse)
+                        }
+
+                        function processPositionChanged(mouse) {
                             if (draggedIndex >= 0) {
                                 if (!selectedItem.dragging) {
-                                    var distance = Math.max(Math.abs(mouseX - startX), Math.abs(mouseY - startY))
+                                    var distance = Math.max(Math.abs(mouse.x - startX), Math.abs(mouse.y - startY))
                                     if (!preDragging && distance > units.gu(1.5)) {
                                         preDragging = true;
                                         quickList.state = "";
@@ -623,15 +635,39 @@
             source: "graphics/quicklist_tooltip.png"
             rotation: 90
         }
-
-        InverseMouseArea {
-            anchors.fill: parent
-            enabled: quickList.state == "open"
-            onClicked: {
-                quickList.state = ""
-            }
-        }
-
+    }
+    InverseMouseArea {
+        anchors.fill: quickListShape
+        enabled: quickList.state == "open" || pressed
+
+        onClicked: {
+            quickList.state = ""
+        }
+
+        // Forward for dragging to work when quickList is open
+
+        onPressed: {
+            var m = mapToItem(dndArea, mouseX, mouseY)
+            dndArea.processPress(m)
+        }
+
+        onPressAndHold: {
+            var m = mapToItem(dndArea, mouseX, mouseY)
+            dndArea.processPressAndHold(m, drag)
+        }
+
+        onPositionChanged: {
+            var m = mapToItem(dndArea, mouseX, mouseY)
+            dndArea.processPositionChanged(m)
+        }
+
+        onCanceled: {
+            dndArea.endDrag(drag);
+        }
+
+        onReleased: {
+            dndArea.endDrag(drag);
+        }
     }
 
     Rectangle {

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-11-24 17:44:18 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-12-03 10:50:28 +0000
@@ -467,9 +467,12 @@
 
         function test_dragndrop_data() {
             return [
-                {tag: "startDrag", fullDrag: false },
-                {tag: "fullDrag horizontal", fullDrag: true, orientation: ListView.Horizontal },
-                {tag: "fullDrag vertical", fullDrag: true, orientation: ListView.Vertical },
+                {tag: "startDrag", fullDrag: false, releaseBeforeDrag: false },
+                {tag: "fullDrag horizontal", fullDrag: true, releaseBeforeDrag: false, orientation: ListView.Horizontal },
+                {tag: "fullDrag vertical", fullDrag: true, releaseBeforeDrag: false, orientation: ListView.Vertical },
+                {tag: "startDrag with quicklist open", fullDrag: false, releaseBeforeDrag: true },
+                {tag: "fullDrag horizontal with quicklist open", fullDrag: true, releaseBeforeDrag: true, orientation: ListView.Horizontal },
+                {tag: "fullDrag vertical with quicklist open", fullDrag: true, releaseBeforeDrag: true, orientation: ListView.Vertical },
             ];
         }
 
@@ -502,6 +505,15 @@
             tryCompare(draggedItem, "itemOpacity", 0)
             tryCompare(fakeDragItem, "visible", true)
 
+            if (data.releaseBeforeDrag) {
+                mouseRelease(launcher);
+                tryCompare(fakeDragItem, "visible", false)
+
+                mousePress(launcher, currentMouseX, currentMouseY);
+                // DraggedItem needs to hide and fakeDragItem become visible
+                tryCompare(fakeDragItem, "visible", true);
+            }
+
             // Dragging a bit (> 1.5 gu)
             newMouseX -= units.gu(2)
             mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
@@ -552,8 +564,10 @@
 
         function test_dragndrop_cancel_data() {
             return [
-                {tag: "by mouse", mouse: true},
-                {tag: "by touch", mouse: false}
+                {tag: "by mouse", mouse: true, releaseBeforeDrag: false},
+                {tag: "by touch", mouse: false, releaseBeforeDrag: false},
+                {tag: "by mouse with quicklist open", mouse: true, releaseBeforeDrag: true},
+                {tag: "by touch with quicklist open", mouse: false, releaseBeforeDrag: true}
             ]
         }
 
@@ -577,6 +591,22 @@
             tryCompare(draggedItem, "itemOpacity", 0)
             tryCompare(fakeDragItem, "visible", true)
 
+            if (data.releaseBeforeDrag) {
+                if(data.mouse) {
+                    mouseRelease(draggedItem)
+                } else {
+                    touchRelease(draggedItem)
+                }
+                tryCompare(fakeDragItem, "visible", false)
+
+                if(data.mouse) {
+                    mousePress(draggedItem, currentMouseX, currentMouseY)
+                } else {
+                    touchPress(draggedItem, currentMouseX, currentMouseY)
+                }
+                tryCompare(fakeDragItem, "visible", true);
+            }
+
             // Dragging
             currentMouseX -= units.gu(20)
 
@@ -604,6 +634,87 @@
             tryCompare(dndArea, "drag.target", undefined)
         }
 
+        function test_dragndrop_with_other_quicklist_open() {
+            dragLauncherIntoView();
+            var draggedItem = findChild(launcher, "launcherDelegate4")
+            var item0 = findChild(launcher, "launcherDelegate0")
+            var fakeDragItem = findChild(launcher, "fakeDragItem")
+            var initialItemHeight = draggedItem.height
+            var item4 = LauncherModel.get(4).appId
+            var item3 = LauncherModel.get(3).appId
+
+            var listView = findChild(launcher, "launcherListView");
+            listView.flick(0, units.gu(200));
+            tryCompare(listView, "flicking", false);
+
+            // Initial state
+            compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
+            compare(fakeDragItem.visible, false, "FakeDragItem isn't invisible at the beginning")
+            tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
+
+            // Doing longpress
+            var mouseOnLauncher = launcher.mapFromItem(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
+            var currentMouseX = mouseOnLauncher.x
+            var currentMouseY = mouseOnLauncher.y
+            var newMouseX = currentMouseX
+            var newMouseY = currentMouseY
+            mousePress(launcher, currentMouseX, currentMouseY)
+            // DraggedItem needs to hide and fakeDragItem become visible
+            tryCompare(draggedItem, "itemOpacity", 0)
+            tryCompare(fakeDragItem, "visible", true)
+
+            mouseRelease(launcher);
+            tryCompare(fakeDragItem, "visible", false)
+
+            // Now let's longpress and drag a different item
+
+            var draggedItem = findChild(launcher, "launcherDelegate3")
+            compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
+            tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
+
+            // Doing longpress
+            var mouseOnLauncher = launcher.mapFromItem(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
+            var currentMouseX = mouseOnLauncher.x
+            var currentMouseY = mouseOnLauncher.y
+            var newMouseX = currentMouseX
+            var newMouseY = currentMouseY
+            mousePress(launcher, currentMouseX, currentMouseY)
+            // DraggedItem needs to hide and fakeDragItem become visible
+            tryCompare(draggedItem, "itemOpacity", 0)
+            tryCompare(fakeDragItem, "visible", true)
+
+            // Dragging a bit (> 1.5 gu)
+            newMouseX -= units.gu(2)
+            mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
+            currentMouseX = newMouseX
+
+            // Other items need to expand and become 0.6 opaque
+            tryCompare(item0, "angle", 0)
+            tryCompare(item0, "itemOpacity", 0.6)
+
+            // Dragging a bit more
+            newMouseY += initialItemHeight * 1.5
+            mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
+            currentMouseY = newMouseY
+
+            tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
+            tryCompare(draggedItem, "height", units.gu(1))
+
+            waitForRendering(draggedItem)
+            compare(LauncherModel.get(4).appId, item3)
+            compare(LauncherModel.get(3).appId, item4)
+
+            // Releasing and checking if initial values are restored
+            mouseRelease(launcher)
+            tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
+            tryCompare(draggedItem, "itemOpacity", 1)
+            tryCompare(fakeDragItem, "visible", false)
+
+            // Click somewhere in the empty space to make it hide in case it isn't
+            mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
+            waitUntilLauncherDisappears();
+        }
+
         function test_quicklist_dismiss() {
             dragLauncherIntoView();
             var draggedItem = findChild(launcher, "launcherDelegate5")