on xenial help sign in
fix workspace drag reordering again
commit6efc4c46767015c6068bda80df5099505fee2fe2 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 17 Mar 2017, 13:18 (10 years ago) parent942c252
2 files changed+4−5
qml/Stage/Spread/ScreensAndWorkspaces.qml−1 qml/Stage/Spread/Workspaces.qml+4−4
qml/Stage/Spread/ScreensAndWorkspaces.qml−1
@@ -81,7 +81,6 @@ Item {
8181 anchors.fill: parent
8282
8383 onClicked: {
84−// PopupUtils.open(contextMenu)
8584 var obj = screensMenuComponent.createObject(header)
8685 obj.open(mouseX, mouseY)
8786 }
qml/Stage/Spread/Workspaces.qml+4−4
@@ -25,14 +25,14 @@ Item {
2525 keys: ['workspace']
2626
2727 onEntered: {
28− listView.updateDropProperties(drag);
29− drag.source.workspace.assign(workspaceModel, listView.hoveredWorkspaceIndex)
28+ var index = listView.getDropIndex(drag);
29+ drag.source.workspace.assign(workspaceModel, index)
3030 drag.source.inDropArea = true;
3131 }
3232
3333 onPositionChanged: {
34− listView.updateDropProperties(drag);
35− if (listView.dropItemIndex == listView.hoveredWorkspaceIndex) return;
34+ var index = listView.getDropIndex(drag);
35+ if (listView.dropItemIndex == index) return;
3636 listView.model.move(listView.dropItemIndex, index, 1);
3737 listView.dropItemIndex = index;
3838 }