Changeset 13161

Timestamp:

Jan 14, 2012, 4:08:45 PM (11 years ago)

Author:

livings124

Message:

use GCD instead of a variable to not animate the main table at launch

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (6 diffs)

trunk/macosx/Controller.h

@@ -92 +92 @@
     
     QLPreviewPanel                  * fPreviewPanel;
-    BOOL                            fLaunching;
     BOOL                            fQuitting;
     BOOL                            fQuitRequested;

trunk/macosx/Controller.m

@@ -214 +214 @@
     if ((self = [super init]))
     {
-        fLaunching = YES;
-        
         fDefaults = [NSUserDefaults standardUserDefaults];
         
@@ -517 +515 @@
     if ([fDefaults boolForKey: @"InfoVisible"])
         [self showInfo: nil];
-    
-    fLaunching = NO;
 }
 
@@ -2187 +2183 @@
     BOOL beganUpdates = NO;
     
-    //don't animate torrents when first launching
-    if (onLion && fLaunching)
-    {
-        [[NSAnimationContext currentContext] setDuration: 0];
+    if (onLion)
+    {
+        //don't animate torrents when first launching
+        static dispatch_once_t onceToken;
+        dispatch_once(&onceToken, ^{
+            [[NSAnimationContext currentContext] setDuration: 0];
+        });
         [NSAnimationContext beginGrouping];
     }
@@ -2204 +2203 @@
         
         //for each of the torrents to add, find if it already exists (and keep track of those we've already added & those we need to remove)
-        [allTorrents enumerateObjectsWithOptions: 0 usingBlock:^(id objAll, NSUInteger previousIndex, BOOL * stop) {
+        [allTorrents enumerateObjectsWithOptions: 0 usingBlock: ^(id objAll, NSUInteger previousIndex, BOOL * stop) {
             const NSUInteger currentIndex = [fDisplayedTorrents indexOfObjectAtIndexes: removePreviousIndexes options: NSEnumerationConcurrent passingTest: ^(id objDisplay, NSUInteger idx, BOOL *stop) {
                 return (BOOL)(objAll == objDisplay);
@@ -2265 +2264 @@
         
         NSMutableDictionary * groupsByIndex = [NSMutableDictionary dictionaryWithCapacity: [fDisplayedTorrents count]];
-        
-        #warning necessary? make more efficient?
         for (TorrentGroup * group in fDisplayedTorrents)
             [groupsByIndex setObject: group forKey: [NSNumber numberWithInteger: [group groupIndex]]];
@@ -2424 +2421 @@
         [fTableView setNeedsDisplay: YES];
         
-        if (fLaunching)
-            [NSAnimationContext endGrouping];
+        [NSAnimationContext endGrouping];
     }
     else