more chicanery to get the web seed table resizing in edge-case situations

diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index a803aea3674fa647e3d7298db074ab580ead0390..3298cc882b49027a9687fe99fedf8f4f2e304506 100644 (file)
--- a/macosx/InfoWindowController.h
+++ b/macosx/InfoWindowController.h
@@ -64,8 +64,7 @@
     IBOutlet NSTextView * fErrorMessageView;
     IBOutlet PiecesView * fPiecesView;
     IBOutlet NSSegmentedControl * fPiecesControl;
-    BOOL fWebSeedTableHidden;
-    float fPeerTableHeight, fWebSeedTableHeight, fWebSeedTableOrigin;
+    float fWebSeedTableHeight, fSpaceBetweenWebSeedAndPeer;
     
     IBOutlet FileOutlineController * fFileController;
     

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index e0df4743ad5bc77a0c5652ef9110e8e5911f6435..a1a1a8d61ad2b79fbbf1033348ca65c968a47ebe 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -72,7 +72,7 @@ typedef enum
 
 - (NSView *) tabViewForTag: (int) tag;
 - (NSArray *) peerSortDescriptors;
-- (void) setWebSeederTableHidden: (BOOL) hidden animate: (BOOL) animate;
+- (void) setWebSeederTableHidden: (BOOL) hide animate: (BOOL) animate;
 
 - (void) addTrackers;
 - (void) removeTrackers;
@@ -174,10 +174,9 @@ typedef enum
     }
     
     //prepare for animating peer table and web seed table
-    fWebSeedTableHidden = NO;
-    fPeerTableHeight = [[fPeerTable enclosingScrollView] frame].size.height;
-    fWebSeedTableHeight = [[fWebSeedTable enclosingScrollView] frame].size.height;
-    fWebSeedTableOrigin = [[fWebSeedTable enclosingScrollView] frame].origin.y;
+    NSRect webSeedTableFrame = [[fWebSeedTable enclosingScrollView] frame];
+    fWebSeedTableHeight = webSeedTableFrame.size.height;
+    fSpaceBetweenWebSeedAndPeer = webSeedTableFrame.origin.y - NSMaxY([[fPeerTable enclosingScrollView] frame]);
     
     [self setWebSeederTableHidden: YES animate: NO];
     
@@ -1440,42 +1439,47 @@ typedef enum
     }
 }
 
-- (void) setWebSeederTableHidden: (BOOL) hidden animate: (BOOL) animate
+- (void) setWebSeederTableHidden: (BOOL) hide animate: (BOOL) animate
 {
-    if (hidden == fWebSeedTableHidden)
-        return;
-    
-    fWebSeedTableHidden = hidden;
-    
     if (![NSApp isOnLeopardOrBetter])
         animate = NO;
     
     NSRect webSeedFrame = [[fWebSeedTable enclosingScrollView] frame];
     NSRect peerFrame = [[fPeerTable enclosingScrollView] frame];
     
-    if (hidden)
+    if (hide)
     {
-        float webSeedFrameMaxY = fWebSeedTableHeight + fWebSeedTableOrigin;
-        peerFrame.size.height = webSeedFrameMaxY - peerFrame.origin.y;
-        
-        webSeedFrame.origin.y = webSeedFrameMaxY;
+        float webSeedFrameMaxY = NSMaxY(webSeedFrame);
         webSeedFrame.size.height = 0;
+        webSeedFrame.origin.y = webSeedFrameMaxY;
+        
+        peerFrame.size.height = webSeedFrameMaxY - peerFrame.origin.y;
     }
     else
     {
-        peerFrame.size.height = fPeerTableHeight;
-        
+        webSeedFrame.origin.y -= fWebSeedTableHeight - webSeedFrame.size.height;
         webSeedFrame.size.height = fWebSeedTableHeight;
-        webSeedFrame.origin.y = fWebSeedTableOrigin;
-    }NSLog(@"%f", webSeedFrame.size.height);
+        
+        peerFrame.size.height = (webSeedFrame.origin.y - fSpaceBetweenWebSeedAndPeer) - peerFrame.origin.y;
+    }
     
     //actually resize tables
-    [NSAnimationContext beginGrouping];
-    
-    [[[fWebSeedTable enclosingScrollView] animator] setFrame: webSeedFrame];
-    [[[fPeerTable enclosingScrollView] animator] setFrame: peerFrame];
-    
-    [NSAnimationContext endGrouping];
+    if (animate)
+    {
+        [NSAnimationContext beginGrouping];
+        
+        [[NSAnimationContext currentContext] setDuration: 0.2];
+        
+        [[[fWebSeedTable enclosingScrollView] animator] setFrame: webSeedFrame];
+        [[[fPeerTable enclosingScrollView] animator] setFrame: peerFrame];
+        
+        [NSAnimationContext endGrouping];
+    }
+    else
+    {
+        [[fWebSeedTable enclosingScrollView] setFrame: webSeedFrame];
+        [[fPeerTable enclosingScrollView] setFrame: peerFrame];
+    }
 }
 
 - (NSArray *) peerSortDescriptors