features/rearrange-columns: fix drop edge cases

chucker · Apr 6, 2024 · 35729b6 · 35729b6
1 parent a52a6c0
commit 35729b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Mastonaut/Features/ArrangeColumns/ArrangeColumnsWindowController.swift b/Mastonaut/Features/ArrangeColumns/ArrangeColumnsWindowController.swift
@@ -68,14 +68,14 @@ class ArrangeColumnsWindowController: NSWindowController, NSCollectionViewDelega
     }
 
     func collectionView(_ collectionView: NSCollectionView, validateDrop draggingInfo: NSDraggingInfo, proposedIndexPath proposedDropIndexPath: AutoreleasingUnsafeMutablePointer<NSIndexPath>, dropOperation proposedDropOperation: UnsafeMutablePointer<NSCollectionView.DropOperation>) -> NSDragOperation {
-        if proposedDropOperation.pointee == .on {
-            proposedDropOperation.pointee = .before
-        }
+        print("proposed index path: \(proposedDropIndexPath.pointee.item), drop operation: \(proposedDropOperation.pointee)")
 
         return .move
     }
 
     func collectionView(_ collectionView: NSCollectionView, acceptDrop draggingInfo: NSDraggingInfo, indexPath: IndexPath, dropOperation: NSCollectionView.DropOperation) -> Bool {
+        print("dropping at: \(indexPath.item)")
+
         guard let stringResult = draggingInfo.draggingPasteboard.propertyList(forType: .string) as? String,
               let stringUtf8Data = stringResult.data(using: .utf8)
         else { return false }

diff --git a/Mastonaut/Window Controllers/TimelinesWindowController.swift b/Mastonaut/Window Controllers/TimelinesWindowController.swift
@@ -1145,10 +1145,20 @@ extension TimelinesWindowController // IBActions
 
         wc.getColumnViewControllers = { [self] in timelinesViewController.columnViewControllers }
         wc.moveColumnViewController = { [self]
-            newControllerAtOldIndex, newIndex in
+            newControllerAtOldIndex, _newIndex in
+
+                // if user drags past the end, treat it as the end
+                let newIndex = min(_newIndex, timelinesViewController.columnViewControllers.count - 1)
 
                 guard let oldIndex = timelinesViewController.columnViewControllers.firstIndex(where: { $0 == newControllerAtOldIndex }),
-                      let newModeAtOldIndex = newControllerAtOldIndex.modelRepresentation,
+                      oldIndex != newIndex
+                else {
+                    print("oldIndex wasn't found or is the same as newIndex")
+
+                    return
+                }
+
+                guard let newModeAtOldIndex = newControllerAtOldIndex.modelRepresentation,
                       let oldModeAtNewIndex = timelinesViewController.columnViewControllers[newIndex].modelRepresentation
                 else { return }