Layer list: improve dragging visuals

MrStevns · Sep 8, 2024 · 495eea8 · 495eea8
1 parent bf6ba4c
commit 495eea8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/src/timelinelayercell.h b/app/src/timelinelayercell.h
@@ -37,7 +37,6 @@ class TimeLineLayerCell : public TimeLineBaseCell
     int getLayerNumber(int posY) const;
 
     bool didDetach() const { return mDidDetach; }
-    bool hasDetached() const { return mIsDraggable; }
     const Layer* layer() const { return mLayer; }
 
 signals:

diff --git a/app/src/timelinelayerlist.cpp b/app/src/timelinelayerlist.cpp
@@ -222,6 +222,12 @@ int TimeLineLayerList::getLayerGutterYPosition(int posY) const
     if(posY > getLayerCellY(layerNumber)) {
         layerNumber--;
     }
+    int maxLayerNum = mEditor->layers()->count() - 1;
+    if (layerNumber > maxLayerNum) {
+        layerNumber = maxLayerNum;
+    } else if (layerNumber < 0) {
+        layerNumber = 0;
+    }
     return getLayerCellY(layerNumber);
 }
 
@@ -254,7 +260,7 @@ void TimeLineLayerList::onCellDragged(const DragEvent& event, const TimeLineLaye
             break;
         }
         case DragEvent::ENDED: {
-            int dragToNumber = getLayerNumber(mGutterPositionY);
+            int dragToNumber = getLayerNumber(mGutterPositionY - (mLayerHeight * 0.5));
             if (!mScrollingVertically && dragToNumber != mFromLayer && dragToNumber > -1)
             {
                 if (dragToNumber < mEditor->layers()->count())
@@ -274,6 +280,7 @@ void TimeLineLayerList::onCellDragged(const DragEvent& event, const TimeLineLaye
             }
             emit cellDraggedY(event, y);
             mGutterPositionY = -1;
+            mFromLayer = -1;
             break;
         }
     }