git.iko.soy/unity8
on xenial help sign in
fix relasing before dragging, improve test
commit635ca9726fe82849404b559bd184003786378fec authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 16 Aug 2013, 23:57 (13 years ago) parent94cff97
2 files changed+9−4
compare with xenial
unifiedsplit
Launcher/LauncherPanel.qml+6−1 tests/qmltests/Launcher/tst_Launcher.qml+3−3
Launcher/LauncherPanel.qml+6−1
@@ -274,7 +274,12 @@ Item {
274274 }
275275
276276 onReleased: {
277− postDragging = true;
277+ if (dragging) {
278+ postDragging = true;
279+ } else {
280+ draggedIndex = -1;
281+ }
282+
278283 selectedItem.highlighted = false
279284 selectedItem.dragging = false;
280285 selectedItem = undefined;
tests/qmltests/Launcher/tst_Launcher.qml+3−3
@@ -272,14 +272,14 @@ Item {
272272
273273 // Initial state
274274 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")
276276 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
277277
278278 // Doing longpress
279279 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
280280 // DraggedItem needs to hide and fakeDragItem become visible
281281 tryCompare(draggedItem, "itemOpacity", 0)
282− tryCompare(fakeDragItem, "itemOpacity", 0.8)
282+ tryCompare(fakeDragItem, "visible", true)
283283
284284 // Dragging a bit (> 1.5 gu)
285285 mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)
@@ -304,7 +304,7 @@ Item {
304304 mouseRelease(draggedItem)
305305 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
306306 tryCompare(draggedItem, "itemOpacity", 1)
307− tryCompare(fakeDragItem, "itemOpacity", 0.8)
307+ tryCompare(fakeDragItem, "visible", false)
308308 }
309309 }
310310}