Merge lp:~fboucault/unity-2d/remove_launcher_drag_drop_workaround_472 into lp:unity-2d/3.0

[Florian Boucault]

[launcher] Removed workaround necessary for Qt bug 15841 fixed in Qt 4.7.2

[Olivier Tilloy (osomon)]

It feels good to remove workarounds :)

One remark: this means that running the trunk as is on Maverick won’t work. No big deal as we don’t officially support that combination anyway, but it would be nice to at least drop a note to Adi Roiban about the change (he maintains an unofficial PPA for the latest unity-2d on Maverick, see https://launchpad.net/~adiroiban/+archive/unity-2d-maverick).

review: Approve

=== modified file 'launcher/ListViewDragAndDrop.qml'
--- launcher/ListViewDragAndDrop.qml	2011-05-26 15:35:07 +0000
+++ launcher/ListViewDragAndDrop.qml	2011-05-31 09:18:50 +0000
@@ -104,24 +104,7 @@
     onExited: drop()
     function reorder() {
         if (draggedTileId != "" && tileAtCursorIndex != -1 && tileAtCursorIndex != draggedTileIndex) {
-            /* Workaround a bug in QML whereby moving an item down in
-               the list results in its visual representation being
-               shifted too far down by one index
-               (http://bugreports.qt.nokia.com/browse/QTBUG-15841).
-               Since the bug happens only when moving an item *down*,
-               and since moving an item one index down is strictly
-               equivalent to moving the item below one index up, we
-               achieve the same result by tricking the list model into
-               thinking that the mirror operation was performed.
-               Note: this bug will be fixed in Qt 4.7.2, at which point
-               this workaround can go away. */
-            if (tileAtCursorIndex > draggedTileIndex) {
-                items.move(tileAtCursorIndex, draggedTileIndex, 1)
-            } else {
-                /* This should be the only code path here, if it wasn’t
-                   for the bug explained and worked around above. */
-                items.move(draggedTileIndex, tileAtCursorIndex, 1)
-            }
+            items.move(draggedTileIndex, tileAtCursorIndex, 1)
             draggedTileIndex = tileAtCursorIndex
         }
     }