@@ -261,8 +261,9 @@ Item {
261261
262262 function test_dragndrop_data() {
263263 return [
264− {tag: "startDrag", fullDrag: false},
265− {tag: "fullDrag", fullDrag: true},
264+ {tag: "startDrag", fullDrag: false },
265+ {tag: "fullDrag horizontal", fullDrag: true, orientation: ListView.Horizontal },
266+ {tag: "fullDrag vertical", fullDrag: true, orientation: ListView.Vertical },
266267 ];
267268 }
268269
@@ -272,8 +273,8 @@ Item {
272273 var item0 = findChild(launcher, "launcherDelegate0")
273274 var fakeDragItem = findChild(launcher, "fakeDragItem")
274275 var initialItemHeight = draggedItem.height
275− var item5Name = LauncherModel.get(5).iconName
276− var item4Name = LauncherModel.get(4).iconName
276+ var item5 = LauncherModel.get(5).appId
277+ var item4 = LauncherModel.get(4).appId
277278
278279 // Initial state
279280 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
@@ -281,28 +282,49 @@ Item {
281282 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
282283
283284 // Doing longpress
284− mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
285+ var currentMouseX = draggedItem.width / 2
286+ var currentMouseY = draggedItem.height / 2
287+ mousePress(draggedItem, currentMouseX, currentMouseY)
285288 // DraggedItem needs to hide and fakeDragItem become visible
286289 tryCompare(draggedItem, "itemOpacity", 0)
287290 tryCompare(fakeDragItem, "visible", true)
288291
289292 // Dragging a bit (> 1.5 gu)
290− mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)
293+ currentMouseX -= units.gu(2)
294+ mouseMove(draggedItem, currentMouseX, currentMouseY)
291295 // Other items need to expand and become 0.6 opaque
292296 tryCompare(item0, "angle", 0)
293297 tryCompare(item0, "itemOpacity", 0.6)
294298
295299 if (data.fullDrag) {
296300 // Dragging a bit more
297− mouseMove(draggedItem, -units.gu(15), draggedItem.height / 2, 100)
298− tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
299− tryCompare(draggedItem, "height", units.gu(1))
301+ if (data.orientation == ListView.Horizontal) {
302+ currentMouseX -= units.gu(15)
303+ mouseMove(draggedItem, currentMouseX, currentMouseY, 100)
304+
305+ tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
306+ tryCompare(draggedItem, "height", units.gu(1))
307+
308+ // Dragging downwards. Item needs to move in the model
309+ currentMouseY -= initialItemHeight * 1.5
310+ mouseMove(draggedItem, currentMouseX, currentMouseY)
311+ } else if (data.orientation == ListView.Vertical) {
312+ currentMouseY -= initialItemHeight * 1.5
313+ mouseMove(draggedItem, currentMouseX, currentMouseY, 100)
314+
315+ tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
316+ tryCompare(draggedItem, "height", units.gu(1))
317+ }
300318
301− // Dragging downwards. Item needs to move in the model
302− mouseMove(draggedItem, -units.gu(15), -initialItemHeight)
303319 waitForRendering(draggedItem)
304− compare(LauncherModel.get(5).iconName, item4Name)
305− compare(LauncherModel.get(5).iconName, item5Name)
320+ print("item4 name", LauncherModel.get(4), LauncherModel.get(4).appId)
321+ print("item5 name", LauncherModel.get(5), LauncherModel.get(5).appId)
322+ print("item6 name", LauncherModel.get(6), LauncherModel.get(6).appId)
323+// tryCompareFunction(function() { LauncherModel.get(appId;}, 0);
324+ wait(200)
325+
326+ compare(LauncherModel.get(5).appId, item4)
327+ compare(LauncherModel.get(4).appId, item5)
306328 }
307329
308330 // Releasing and checking if initial values are restored
@@ -310,6 +332,10 @@ Item {
310332 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
311333 tryCompare(draggedItem, "itemOpacity", 1)
312334 tryCompare(fakeDragItem, "visible", false)
335+
336+ // Click somewhere in the empty space to make it hide in case it isn't
337+ mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
338+ revealer.waitUntilLauncherDisappears();
313339 }
314340
315341 function test_quicklist_dismiss() {