git.iko.soy/unity8
on xenial help sign in
Convert the MouseArea to MultiPointTouchArea to track multiple touch points. Fixes: #1445472
ab7130bhandsome_feng
qml/Launcher/Launcher.qml+2−1
compare with xenial
unifiedsplit
@@ -177,7 +177,8 @@ Item {
177 }
177 }
178
178
179 }
179 }
180− MouseArea {
180+
181+ MultiPointTouchArea {
181 id: closeMouseArea
182 id: closeMouseArea
182 anchors {
183 anchors {
183 left: launcherDragArea.right
184 left: launcherDragArea.right
tests/qmltests/Launcher/tst_Launcher.qml+27−5
@@ -520,7 +520,14 @@ Item {
520 waitUntilLauncherDisappears();
520 waitUntilLauncherDisappears();
521 }
521 }
522
522
523+ function test_dragndrop_cancel_data() {
524+ return [
525+ {tag: "by mouse", mouse: true},
526+ {tag: "by touch", mouse: false}
527+ ]
528+ }
529+
523− function test_dragndrop_cancel() {
530+ function test_dragndrop_cancel(data) {
524 dragLauncherIntoView();
531 dragLauncherIntoView();
525 var draggedItem = findChild(launcher, "launcherDelegate4")
532 var draggedItem = findChild(launcher, "launcherDelegate4")
526 var item0 = findChild(launcher, "launcherDelegate0")
533 var item0 = findChild(launcher, "launcherDelegate0")
@@ -529,22 +536,37 @@ Item {
529 // Doing longpress
536 // Doing longpress
530 var currentMouseX = draggedItem.width / 2
537 var currentMouseX = draggedItem.width / 2
531 var currentMouseY = draggedItem.height / 2
538 var currentMouseY = draggedItem.height / 2
539+
540+ if(data.mouse) {
532− mousePress(draggedItem, currentMouseX, currentMouseY)
541+ mousePress(draggedItem, currentMouseX, currentMouseY)
542+ } else {
543+ touchPress(draggedItem, currentMouseX, currentMouseY)
544+ }
545+
533 // DraggedItem needs to hide and fakeDragItem become visible
546 // DraggedItem needs to hide and fakeDragItem become visible
534 tryCompare(draggedItem, "itemOpacity", 0)
547 tryCompare(draggedItem, "itemOpacity", 0)
535 tryCompare(fakeDragItem, "visible", true)
548 tryCompare(fakeDragItem, "visible", true)
536
549
537 // Dragging
550 // Dragging
538 currentMouseX -= units.gu(20)
551 currentMouseX -= units.gu(20)
552+
553+ if(data.mouse) {
539− mouseMove(draggedItem, currentMouseX, currentMouseY)
554+ mouseMove(draggedItem, currentMouseX, currentMouseY)
555+ } else {
556+ touchMove(draggedItem, currentMouseX, currentMouseY)
557+ }
540
558
541 // Make sure we're in the dragging state
559 // Make sure we're in the dragging state
542 var dndArea = findChild(launcher, "dndArea");
560 var dndArea = findChild(launcher, "dndArea");
543 tryCompare(draggedItem, "dragging", true)
561 tryCompare(draggedItem, "dragging", true)
544 tryCompare(dndArea, "draggedIndex", 4)
562 tryCompare(dndArea, "draggedIndex", 4)
545
563
546− // Tap somewhere in the middle of the screen to close/hide the launcher
564+ // Click/Tap somewhere in the middle of the screen to close/hide the launcher
565+ if(data.mouse) {
566+ mouseClick(root)
567+ } else {
547− tap(root)
568+ tap(root)
569+ }
548
570
549 // Make sure the dnd operation has been stopped
571 // Make sure the dnd operation has been stopped
550 tryCompare(draggedItem, "dragging", false)
572 tryCompare(draggedItem, "dragging", false)
tests/utils/modules/Unity/Test/UnityTestCase.qml+9
@@ -351,6 +351,15 @@ TestCase {
351 event.commit()
351 event.commit()
352 }
352 }
353
353
354+ function touchMove(item, tox, toy) {
355+ var root = fetchRootItem(item)
356+ var rootPoint = item.mapToItem(root, tox, toy)
357+
358+ var event = touchEvent(item);
359+ event.move(0 /* touchId */, rootPoint.x, rootPoint.y);
360+ event.commit();
361+ }
362+
354 function touchPinch(item, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End) {
363 function touchPinch(item, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End) {
355 // Make sure the item is rendered
364 // Make sure the item is rendered
356 waitForRendering(item);
365 waitForRendering(item);