git.iko.soy/unity8
on xenial help sign in
fix relasing before dragging, improve test
635ca97Michael Zanetti
Launcher/LauncherPanel.qml+6−1
compare with xenial
unifiedsplit
@@ -274,7 +274,12 @@ Item {
274 }
274 }
275
275
276 onReleased: {
276 onReleased: {
277+ if (dragging) {
277− postDragging = true;
278+ postDragging = true;
279+ } else {
280+ draggedIndex = -1;
281+ }
282+
278 selectedItem.highlighted = false
283 selectedItem.highlighted = false
279 selectedItem.dragging = false;
284 selectedItem.dragging = false;
280 selectedItem = undefined;
285 selectedItem = undefined;
tests/qmltests/Launcher/tst_Launcher.qml+3−3
@@ -272,14 +272,14 @@ Item {
272
272
273 // Initial state
273 // Initial state
274 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
274 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
275− compare(fakeDragItem.itemOpacity, 0.8, "FakeDragItem isn't invisible at the beginning")
275+ compare(fakeDragItem.visible, false, "FakeDragItem isn't invisible at the beginning")
276 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
276 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
277
277
278 // Doing longpress
278 // Doing longpress
279 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
279 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
280 // DraggedItem needs to hide and fakeDragItem become visible
280 // DraggedItem needs to hide and fakeDragItem become visible
281 tryCompare(draggedItem, "itemOpacity", 0)
281 tryCompare(draggedItem, "itemOpacity", 0)
282− tryCompare(fakeDragItem, "itemOpacity", 0.8)
282+ tryCompare(fakeDragItem, "visible", true)
283
283
284 // Dragging a bit (> 1.5 gu)
284 // Dragging a bit (> 1.5 gu)
285 mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)
285 mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)
@@ -304,7 +304,7 @@ Item {
304 mouseRelease(draggedItem)
304 mouseRelease(draggedItem)
305 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
305 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
306 tryCompare(draggedItem, "itemOpacity", 1)
306 tryCompare(draggedItem, "itemOpacity", 1)
307− tryCompare(fakeDragItem, "itemOpacity", 0.8)
307+ tryCompare(fakeDragItem, "visible", false)
308 }
308 }
309 }
309 }
310}
310}