Changeset 6081

Timestamp:

Jun 8, 2008, 4:11:29 AM (14 years ago)

Author:

livings124

Message:

re-implement animated resizing of the web seed table, this time in a safer and 10.4-compatable way

Location:

trunk/macosx

Files:

• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (4 diffs)

trunk/macosx/InfoWindowController.h

@@ -66 +66 @@
     IBOutlet NSSegmentedControl * fPiecesControl;
     float fWebSeedTableHeight, fSpaceBetweenWebSeedAndPeer;
+    NSViewAnimation * fWebSeedTableAnimation;
     
     IBOutlet FileOutlineController * fFileController;

trunk/macosx/InfoWindowController.m

@@ -636 +636 @@
 }
 
+- (NSSize) windowWillResize: (NSWindow *) window toSize: (NSSize) proposedFrameSize
+{
+    [fWebSeedTableAnimation stopAnimation];
+    return proposedFrameSize;
+}
+
+- (void) windowDidResize: (NSNotification *) notification
+{
+    //this is an edge-case - if it's reached, just safely resize the tables without animation
+    if (fWebSeedTableAnimation)
+        [self setWebSeederTableHidden: !fWebSeeds || [fWebSeeds count] == 0 animate: NO];
+}
+
 - (void) setTab: (id) sender
 {
@@ -1442 +1455 @@
 - (void) setWebSeederTableHidden: (BOOL) hide animate: (BOOL) animate
 {
-    if (/*![NSApp isOnLeopardOrBetter]*/YES)
+    if (![[self window] isVisible])
         animate = NO;
+    
+    if (fWebSeedTableAnimation)
+    {
+        [fWebSeedTableAnimation stopAnimation];
+        [fWebSeedTableAnimation release];
+        fWebSeedTableAnimation = nil;
+    }
     
     NSRect webSeedFrame = [[fWebSeedTable enclosingScrollView] frame];
@@ -1464 +1484 @@
     }
     
+    [[fWebSeedTable enclosingScrollView] setHidden: NO]; //this is needed for some reason
+    
     //actually resize tables
     if (animate)
     {
-        [NSAnimationContext beginGrouping];
-        
-        [[NSAnimationContext currentContext] setDuration: 0.2];
-        
-        [[[fWebSeedTable enclosingScrollView] animator] setFrame: webSeedFrame];
-        [[[fPeerTable enclosingScrollView] animator] setFrame: peerFrame];
-        
-        [NSAnimationContext endGrouping];
+        NSDictionary * webSeedDict = [NSDictionary dictionaryWithObjectsAndKeys:
+                        [fWebSeedTable enclosingScrollView], NSViewAnimationTargetKey,
+                        [NSValue valueWithRect: [[fWebSeedTable enclosingScrollView] frame]], NSViewAnimationStartFrameKey,
+                        [NSValue valueWithRect: webSeedFrame], NSViewAnimationEndFrameKey, nil],
+                    * peerDict = [NSDictionary dictionaryWithObjectsAndKeys:
+                        [fPeerTable enclosingScrollView], NSViewAnimationTargetKey,
+                        [NSValue valueWithRect: [[fPeerTable enclosingScrollView] frame]], NSViewAnimationStartFrameKey,
+                        [NSValue valueWithRect: peerFrame], NSViewAnimationEndFrameKey, nil];
+        
+        fWebSeedTableAnimation = [[NSViewAnimation alloc] initWithViewAnimations:
+                                        [NSArray arrayWithObjects: webSeedDict, peerDict, nil]];
+        [fWebSeedTableAnimation setDuration: 0.2];
+        [fWebSeedTableAnimation setAnimationBlockingMode: NSAnimationNonblockingThreaded];
+        [fWebSeedTableAnimation setDelegate: self];
+        
+        [fWebSeedTableAnimation startAnimation];
     }
     else
@@ -1480 +1510 @@
         [[fWebSeedTable enclosingScrollView] setFrame: webSeedFrame];
         [[fPeerTable enclosingScrollView] setFrame: peerFrame];
+    }
+}
+
+- (void) animationDidEnd: (NSAnimation *) animation
+{
+    if (animation == fWebSeedTableAnimation)
+    {
+        [fWebSeedTableAnimation release];
+        fWebSeedTableAnimation = nil;
     }
 }