getting a little cleaner

This commit is contained in:
Chris Cochrun 2022-08-25 06:17:03 -05:00
parent 19c7e4cd40
commit 2583accef1
2 changed files with 11 additions and 11 deletions

View file

@ -110,11 +110,9 @@ ColumnLayout {
dragItemText, dragItemText,
dragItemIndex); dragItemIndex);
} else if (drag.keys[0] === "serviceitem") { } else if (drag.keys[0] === "serviceitem") {
moveRequested(dragItemIndex, index); serviceItemModel.move(serviceItemList.indexDragged,
if (hlIndex === serviceItemList.indexDragged) serviceItemList.moveToIndex);
serviceItemList.currentIndex = index; serviceItemList.currentIndex = moveToIndex;
else if (hlIndex === index)
serviceItemList.currentIndex = index + 1;
} }
indexedHLRec.visible = false; indexedHLRec.visible = false;
} }
@ -233,10 +231,6 @@ ColumnLayout {
onTriggered: removeItem(index); onTriggered: removeItem(index);
} }
} }
function dropPlacement(drag) {
print(drag.y);
}
} }
} }
@ -264,7 +258,13 @@ ColumnLayout {
} }
function moveRequested(oldIndex, newIndex) { function moveRequested(oldIndex, newIndex) {
serviceItemModel.move(oldIndex, newIndex); if (newIndex === oldIndex)
return;
if (newIndex === -1)
newIndex = 0;
print("moveRequested: ", oldIndex, newIndex);
visualModel.items.move(oldIndex, newIndex);
indexDragged = newIndex;
} }
} }

View file

@ -191,7 +191,7 @@ bool ServiceItemModel::move(int sourceIndex, int destIndex) {
sourceIndex, QModelIndex(), destIndex); sourceIndex, QModelIndex(), destIndex);
if (begsuc) { if (begsuc) {
if (destIndex = -1) if (destIndex = -1)
m_item.move(sourceIndex, 0); m_items.move(sourceIndex, 0);
else else
m_items.move(sourceIndex, destIndex); m_items.move(sourceIndex, destIndex);
endMoveRows(); endMoveRows();