@@ -18,14 +18,14 @@ Item {
1818 keys: ['workspace']
1919
2020 onEntered: {
21− var index = listView.getWorkspaceDropIndex(drag);
21+ var index = listView.getDropIndex(drag);
2222 listView.model.insert(index, {text: drag.source.text})
2323 listView.dropItemIndex = index;
2424 drag.source.inDropArea = true;
2525 }
2626
2727 onPositionChanged: {
28− var index = listView.getWorkspaceDropIndex(drag);
28+ var index = listView.getDropIndex(drag);
2929 if (listView.dropItemIndex == index) return;
3030 listView.model.move(listView.dropItemIndex, index, 1);
3131 listView.dropItemIndex = index;
@@ -48,7 +48,7 @@ Item {
4848
4949 onPositionChanged: {
5050 listView.progressiveScroll(drag.x)
51− listView.hoveredWorkspaceIndex = listView.getApplicationDropIndex(drag)
51+ listView.hoveredWorkspaceIndex = listView.getDropIndex(drag)
5252 }
5353 onExited: {
5454 listView.hoveredWorkspaceIndex = -1
@@ -73,16 +73,7 @@ Item {
7373 property int dropItemIndex: -1
7474 property int hoveredWorkspaceIndex: -1
7575
76− function getWorkspaceDropIndex(drag) {
77− var coords = mapToItem(listView.contentItem, drag.x, drag.y)
78− var index = Math.floor((drag.x + listView.realContentX) / (listView.itemWidth + listView.spacing));
79− if (index < 0) index = 0;
80− var upperLimit = dropItemIndex == -1 ? listView.count : listView.count - 1
81− if (index > upperLimit) index = upperLimit;
82− return index;
83− }
84−
85− function getApplicationDropIndex(drag) {
76+ function getDropIndex(drag) {
8677 var coords = mapToItem(listView.contentItem, drag.x, drag.y)
8778 var index = Math.floor((drag.x + listView.realContentX) / (listView.itemWidth + listView.spacing));
8879 if (index < 0) index = 0;