Fix cases where dragging could initiate a swap from the same layer

MrStevns · Sep 10, 2024 · 701b11d · 701b11d
1 parent 9eb6c32
commit 701b11d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/src/timelinelayerlist.cpp b/app/src/timelinelayerlist.cpp
@@ -255,14 +255,22 @@ void TimeLineLayerList::onCellDragged(const DragEvent& event, const TimeLineLaye
             emit cellDraggedY(event, y);
             break;
         }
-            // mToLayer = mFromLayer;
         case DragEvent::DRAGGING: {
             mGutterPositionY = getLayerGutterYPosition(y);
             emit cellDraggedY(event, y);
             break;
         }
         case DragEvent::ENDED: {
-            int dragToNumber = getLayerNumber(mGutterPositionY - (mLayerHeight * 0.5));
+            int dragToNumber = mFromLayer;
+            int fromLayerDragY = getLayerCellY(mFromLayer);
+            if (fromLayerDragY > mGutterPositionY) {
+                // If we're starting from above, adjust the drag number so we're one cell above
+                dragToNumber = getLayerNumber(mGutterPositionY + (mLayerHeight * 0.5));
+            } else if (fromLayerDragY < mGutterPositionY) {
+                // If we're starting from below, adjust the drag number so we're one cell below
+                dragToNumber = getLayerNumber(mGutterPositionY - (mLayerHeight * 0.5));
+            }
+
             if (!mScrollingVertically && dragToNumber != mFromLayer && dragToNumber > -1)
             {
                 if (dragToNumber < mEditor->layers()->count())