git.iko.soy/unity8
on xenial help sign in
fix workspace drag reordering again
6efc4c4Michael Zanetti
qml/Stage/Spread/ScreensAndWorkspaces.qml−1
compare with xenial
unifiedsplit
@@ -81,7 +81,6 @@ Item {
81 anchors.fill: parent
81 anchors.fill: parent
82
82
83 onClicked: {
83 onClicked: {
84−// PopupUtils.open(contextMenu)
85 var obj = screensMenuComponent.createObject(header)
84 var obj = screensMenuComponent.createObject(header)
86 obj.open(mouseX, mouseY)
85 obj.open(mouseX, mouseY)
87 }
86 }
qml/Stage/Spread/Workspaces.qml+4−4
@@ -25,14 +25,14 @@ Item {
25 keys: ['workspace']
25 keys: ['workspace']
26
26
27 onEntered: {
27 onEntered: {
28− listView.updateDropProperties(drag);
28+ var index = listView.getDropIndex(drag);
29− drag.source.workspace.assign(workspaceModel, listView.hoveredWorkspaceIndex)
29+ drag.source.workspace.assign(workspaceModel, index)
30 drag.source.inDropArea = true;
30 drag.source.inDropArea = true;
31 }
31 }
32
32
33 onPositionChanged: {
33 onPositionChanged: {
34− listView.updateDropProperties(drag);
34+ var index = listView.getDropIndex(drag);
35− if (listView.dropItemIndex == listView.hoveredWorkspaceIndex) return;
35+ if (listView.dropItemIndex == index) return;
36 listView.model.move(listView.dropItemIndex, index, 1);
36 listView.model.move(listView.dropItemIndex, index, 1);
37 listView.dropItemIndex = index;
37 listView.dropItemIndex = index;
38 }
38 }