git.iko.soy/unity8
on xenial help sign in
Make sure dnd mode is ended properly when drag gesture is cancelled Fixes: #1444949
598c584Michael Zanetti
qml/Launcher/LauncherPanel.qml+5−3
compare with xenial
unifiedsplit
@@ -338,12 +338,14 @@ Rectangle {
338 }
338 }
339
339
340 onCanceled: {
340 onCanceled: {
341− selectedItem = undefined;
341+ endDrag();
342− preDragging = false;
343− postDragging = false;
344 }
342 }
345
343
346 onReleased: {
344 onReleased: {
345+ endDrag();
346+ }
347+
348+ function endDrag() {
347 var droppedIndex = draggedIndex;
349 var droppedIndex = draggedIndex;
348 if (dragging) {
350 if (dragging) {
349 postDragging = true;
351 postDragging = true;
tests/qmltests/Launcher/tst_Launcher.qml+32
@@ -459,6 +459,38 @@ Item {
459 waitUntilLauncherDisappears();
459 waitUntilLauncherDisappears();
460 }
460 }
461
461
462+ function test_dragndrop_cancel() {
463+ dragLauncherIntoView();
464+ var draggedItem = findChild(launcher, "launcherDelegate4")
465+ var item0 = findChild(launcher, "launcherDelegate0")
466+ var fakeDragItem = findChild(launcher, "fakeDragItem")
467+
468+ // Doing longpress
469+ var currentMouseX = draggedItem.width / 2
470+ var currentMouseY = draggedItem.height / 2
471+ mousePress(draggedItem, currentMouseX, currentMouseY)
472+ // DraggedItem needs to hide and fakeDragItem become visible
473+ tryCompare(draggedItem, "itemOpacity", 0)
474+ tryCompare(fakeDragItem, "visible", true)
475+
476+ // Dragging
477+ currentMouseX -= units.gu(20)
478+ mouseMove(draggedItem, currentMouseX, currentMouseY)
479+
480+ // Make sure we're in the dragging state
481+ var dndArea = findChild(launcher, "dndArea");
482+ tryCompare(draggedItem, "dragging", true)
483+ tryCompare(dndArea, "draggedIndex", 4)
484+
485+ // Tap somewhere in the middle of the screen to close/hide the launcher
486+ tap(root)
487+
488+ // Make sure the dnd operation has been stopped
489+ tryCompare(draggedItem, "dragging", false)
490+ tryCompare(dndArea, "draggedIndex", -1)
491+ tryCompare(dndArea, "drag.target", undefined)
492+ }
493+
462 function test_quicklist_dismiss() {
494 function test_quicklist_dismiss() {
463 dragLauncherIntoView();
495 dragLauncherIntoView();
464 var draggedItem = findChild(launcher, "launcherDelegate5")
496 var draggedItem = findChild(launcher, "launcherDelegate5")