Changeset 13138 for trunk/macosx/Controller.m

Timestamp:

Jan 7, 2012, 9:05:02 PM (10 years ago)

Author:

livings124

Message:

Animate rearranging the queue separately from the main filter animation. This allows us to ensure that the animation shows the dragged torrents being moved instead of the torrents around them.

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -2911 +2911 @@
         NSMutableArray * movingTorrents = [NSMutableArray arrayWithCapacity: [indexes count]];
         for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
-            [movingTorrents addObject: [fTableView itemAtRow: i]];
-        
-        //reset groups
-        if (item)
-        {
+        {
+            Torrent * torrent = [fTableView itemAtRow: i];
+            [movingTorrents addObject: torrent];
+            
             //change groups
-            const NSInteger groupValue = [item groupIndex];
-            [movingTorrents enumerateObjectsWithOptions: NSEnumerationConcurrent usingBlock: ^(id obj, NSUInteger idx, BOOL *stop)  {
-                [(Torrent *)obj setGroupValue: groupValue];
-            }];
+            if (item)
+                [torrent setGroupValue: [item groupIndex]];
         }
         
@@ -2943 +2940 @@
             
             //insert objects at new location
-            NSUInteger insertIndex = topTorrent ? [fTorrents indexOfObject: topTorrent] + 1 : 0;
+            const NSUInteger insertIndex = topTorrent ? [fTorrents indexOfObject: topTorrent] + 1 : 0;
             NSIndexSet * insertIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(insertIndex, [movingTorrents count])];
             [fTorrents insertObjects: movingTorrents atIndexes: insertIndexes];
@@ -2954 +2951 @@
                 [torrent update];
             }
+            
+            //do the drag animation here so that the dragged torrents are the ones that are animated as moving, and not the torrents around them
+            const BOOL onLion = [NSApp isOnLionOrBetter];
+            if (onLion)
+                [fTableView beginUpdates];
+            
+            NSUInteger insertDisplayIndex = topTorrent ? [groupTorrents indexOfObject: topTorrent] + 1 : 0;
+            
+            for (Torrent * torrent in movingTorrents)
+            {
+                TorrentGroup * oldParent = item ? [fTableView parentForItem: torrent] : nil;
+                NSMutableArray * oldTorrents = oldParent ? [oldParent torrents] : fDisplayedTorrents;
+                const NSUInteger oldIndex = [oldTorrents indexOfObject: torrent];
+                
+                if (item == oldParent)
+                {
+                    if (oldIndex < insertDisplayIndex)
+                        --insertDisplayIndex;
+                    [oldTorrents moveObjectAtIndex: oldIndex toIndex: insertDisplayIndex];
+                }
+                else
+                {
+                    NSMutableArray * newTorrents = [(TorrentGroup *)item torrents];
+                    [newTorrents insertObject: torrent atIndex: insertDisplayIndex];
+                    [oldTorrents removeObjectAtIndex: oldIndex];
+                }
+                
+                if (onLion)
+                    [fTableView moveItemAtIndex: oldIndex inParent: oldParent toIndex: insertDisplayIndex inParent: item];
+                
+                ++insertDisplayIndex;
+            }
+            
+            if (onLion)
+                [fTableView endUpdates];
         }