Changeset 502

Timestamp:

Jul 2, 2006, 9:46:18 PM (16 years ago)

Author:

livings124

Message:

Make row dragging work with multiple rows. The order values will all properly adjust too.

File:

• trunk/macosx/Controller.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -1183 +1183 @@
     else
     {
+        #warning redo selected torrents
+    
         NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData:
                                 [pasteboard dataForType: TorrentTableViewDataType]];
-        int oldRow = [indexes firstIndex];
-        
-        //move torrent in array
-        if (newRow == oldRow)
-            return;
-        
-        Torrent * torrent = [[fTorrents objectAtIndex: oldRow] retain];
-        
-        int low, high;
-        if (newRow > oldRow)
-        {
-            newRow--;
-            
-            low = oldRow;
-            high = newRow;
-        }
-        else
-        {
+        
+        //move torrent in array 
+        NSArray * movingTorrents = [[self torrentsAtIndexes: indexes] retain];
+        [fTorrents removeObjectsInArray: movingTorrents];
+        
+        //determine the insertion index now that transfers to move have been removed
+        int i, decrease = 0;
+        for (i = [indexes firstIndex]; i < newRow && i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
+            decrease++;
+        
+        //insert objects at new location
+        for (i = 0; i < [movingTorrents count]; i++)
+            [fTorrents insertObject: [movingTorrents objectAtIndex: i] atIndex: newRow - decrease + i];
+        
+        [movingTorrents release];
+        
+        //redo order values
+        int low = [indexes firstIndex], high = [indexes lastIndex];
+        if (newRow < low)
             low = newRow;
-            high = oldRow;
-        }
-        
-        [fTorrents removeObjectAtIndex: oldRow];
-        [fTorrents insertObject: torrent atIndex: newRow];
-        [torrent release];
-        
-        //redo order values
-        int i;
+        else if (newRow > high + 1)
+            high = newRow - 1;
+        else;
+        
         for (i = low; i <= high; i++)
             [[fTorrents objectAtIndex: i] setOrderValue: i];