Changeset 5136

Timestamp:

Feb 27, 2008, 2:06:46 AM (14 years ago)

Author:

livings124

Message:

cleanup for last commit

File:

• trunk/macosx/InfoWindowController.m (modified) (9 diffs)

trunk/macosx/InfoWindowController.m

@@ -584 +584 @@
 - (void) setTab: (id) sender
 {
+    int oldTabTag = fCurrentTabTag;
+    fCurrentTabTag = [fTabMatrix selectedTag];
+    if (fCurrentTabTag == oldTabTag)
+        return;
+    
     [self updateInfoStats];
     
-    //save old heights
-    int oldTabTag = fCurrentTabTag;
-    NSView * oldView = [self tabViewForTag: oldTabTag];
-    
-    BOOL oldCanResizeVertical;
-    NSString * oldResizeSaveKey;
-    switch (fCurrentTabTag)
-    {
-        case TAB_TRACKER_TAG:
-            oldResizeSaveKey = @"InspectorContentHeightTracker";
-            oldCanResizeVertical = YES;
-            break;
-        case TAB_PEERS_TAG:
-            oldResizeSaveKey = @"InspectorContentHeightPeers";
-            oldCanResizeVertical = YES;
-            break;
-        case TAB_FILES_TAG:
-            oldResizeSaveKey = @"InspectorContentHeightFiles";
-            oldCanResizeVertical = YES;
-            break;
-        default:
-            oldCanResizeVertical = NO;
-    }
-    
+    //take care of old view
     float oldHeight = 0;
-    
+    NSString * oldResizeSaveKey = nil;
     if (oldTabTag != INVALID)
+    {
+        //deselect old tab item
+        [(InfoTabButtonCell *)[fTabMatrix cellWithTag: oldTabTag] setSelectedTab: NO];
+        
+        switch (oldTabTag)
+        {
+            case TAB_TRACKER_TAG:
+                oldResizeSaveKey = @"InspectorContentHeightTracker";
+                break;
+            case TAB_PEERS_TAG:
+                oldResizeSaveKey = @"InspectorContentHeightPeers";
+                break;
+            case TAB_FILES_TAG:
+                oldResizeSaveKey = @"InspectorContentHeightFiles";
+                break;
+        }
+        
+        NSView * oldView = [self tabViewForTag: oldTabTag];
         oldHeight = [oldView frame].size.height;
-    if (oldCanResizeVertical)
-        [[NSUserDefaults standardUserDefaults] setFloat: [oldView frame].size.height forKey: oldResizeSaveKey];
+        if (oldResizeSaveKey)
+            [[NSUserDefaults standardUserDefaults] setFloat: oldHeight forKey: oldResizeSaveKey];
+        
+        //get old view
+        [oldView setHidden: YES];
+        [oldView removeFromSuperview];
+    }
     
     //set current tag
-    BOOL canResizeVertical;
-    NSString * resizeSaveKey;
-    fCurrentTabTag = [fTabMatrix selectedTag];
+    NSString * resizeSaveKey = nil;
     
     NSView * view;
@@ -630 +633 @@
             identifier = TAB_INFO_IDENT;
             title = NSLocalizedString(@"General Info", "Inspector -> title");
-            canResizeVertical = NO;
             break;
         case TAB_ACTIVITY_TAG:
@@ -636 +638 @@
             identifier = TAB_ACTIVITY_IDENT;
             title = NSLocalizedString(@"Activity", "Inspector -> title");
-            canResizeVertical = NO;
             
             [fPiecesView updateView: YES];
@@ -644 +645 @@
             identifier = TAB_TRACKER_IDENT;
             title = NSLocalizedString(@"Tracker", "Inspector -> title");
-            
             resizeSaveKey = @"InspectorContentHeightTracker";
-            canResizeVertical = YES;
             break;
         case TAB_PEERS_TAG:
@@ -652 +651 @@
             identifier = TAB_PEERS_IDENT;
             title = NSLocalizedString(@"Peers", "Inspector -> title");
-            
             resizeSaveKey = @"InspectorContentHeightPeers";
-            canResizeVertical = YES;
             break;
         case TAB_FILES_TAG:
@@ -660 +657 @@
             identifier = TAB_FILES_IDENT;
             title = NSLocalizedString(@"Files", "Inspector -> title");
-            
             resizeSaveKey = @"InspectorContentHeightFiles";
-            canResizeVertical = YES;
             break;
         case TAB_OPTIONS_TAG:
@@ -668 +663 @@
             identifier = TAB_OPTIONS_IDENT;
             title = NSLocalizedString(@"Options", "Inspector -> title");
-            canResizeVertical = NO;
             break;
         default:
             return;
     }
-        
+    
     [[NSUserDefaults standardUserDefaults] setObject: identifier forKey: @"InspectorSelected"];
     
     NSWindow * window = [self window];
-    
-    /*if (fCurrentTabTag == oldTabTag)
-        return;*/
-    
-    #warning move?
-    if (oldTabTag != INVALID)
-    {
-        //deselect old tab item
-        [(InfoTabButtonCell *)[fTabMatrix cellWithTag: oldTabTag] setSelectedTab: NO];
-        
-        //get old view
-        [oldView setHidden: YES];
-        [oldView removeFromSuperview];
-    }
     
     [window setTitle: [NSString stringWithFormat: @"%@ - %@", title, NSLocalizedString(@"Torrent Inspector", "Inspector -> title")]];
@@ -699 +679 @@
     NSRect windowRect = [window frame], viewRect = [view frame];
     
-    if (canResizeVertical)
+    if (resizeSaveKey)
     {
         float height = [[NSUserDefaults standardUserDefaults] floatForKey: resizeSaveKey];
@@ -710 +690 @@
     windowRect.size.height += difference;
     
-    if (canResizeVertical)
-    {
-        if (!oldCanResizeVertical)
+    if (resizeSaveKey)
+    {
+        if (!oldResizeSaveKey)
         {
             [window setMinSize: NSMakeSize([window minSize].width, windowRect.size.height - viewRect.size.height + TAB_MIN_HEIGHT)];