From 2583accef1f74e47124932b0db145181851fc66c Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Thu, 25 Aug 2022 06:17:03 -0500
Subject: [PATCH] getting a little cleaner

---
 src/qml/presenter/LeftDock.qml | 20 ++++++++++----------
 src/serviceitemmodel.cpp       |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml
index e49b4dd..518e5b6 100644
--- a/src/qml/presenter/LeftDock.qml
+++ b/src/qml/presenter/LeftDock.qml
@@ -110,11 +110,9 @@ ColumnLayout {
                                     dragItemText,
                                     dragItemIndex);
                         } else if (drag.keys[0] === "serviceitem") {
-                            moveRequested(dragItemIndex, index);
-                            if (hlIndex === serviceItemList.indexDragged)
-                                serviceItemList.currentIndex = index;
-                            else if (hlIndex === index)
-                                serviceItemList.currentIndex = index + 1;
+                            serviceItemModel.move(serviceItemList.indexDragged,
+                                                  serviceItemList.moveToIndex);
+                            serviceItemList.currentIndex = moveToIndex;
                         }
                         indexedHLRec.visible = false;
                     }
@@ -233,10 +231,6 @@ ColumnLayout {
                             onTriggered: removeItem(index);
                         }
                     }
-
-                    function dropPlacement(drag) {
-                        print(drag.y);
-                    }
                 }
 
             }
@@ -264,7 +258,13 @@ ColumnLayout {
             }
 
             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;
             }
 
         }
diff --git a/src/serviceitemmodel.cpp b/src/serviceitemmodel.cpp
index d29d9ae..fe326b1 100644
--- a/src/serviceitemmodel.cpp
+++ b/src/serviceitemmodel.cpp
@@ -191,7 +191,7 @@ bool ServiceItemModel::move(int sourceIndex, int destIndex) {
                                 sourceIndex, QModelIndex(), destIndex);
     if (begsuc) {
       if (destIndex = -1)
-        m_item.move(sourceIndex, 0);
+        m_items.move(sourceIndex, 0);
       else
         m_items.move(sourceIndex, destIndex);
       endMoveRows();