Changeset 5273 for trunk/macosx/TorrentTableView.m

Timestamp:

Mar 17, 2008, 9:44:14 PM (14 years ago)

Author:

livings124

Message:

fix display issue on launch when group row is set to show ratio

File:

• trunk/macosx/TorrentTableView.m (modified) (4 diffs)

trunk/macosx/TorrentTableView.m

@@ -37 +37 @@
 #define PIECE_TIME 0.005
 
+#define GROUP_SPEED_IMAGE_COLUMN_WIDTH 8.0
+#define GROUP_RATIO_IMAGE_COLUMN_WIDTH 10.0
+
 @interface TorrentTableView (Private)
 
@@ -91 +94 @@
             fCollapsedGroups = [[NSMutableIndexSet alloc] init];
         
-        //set group columns to show ratio (nib is set to speeds)
-        if ([fDefaults boolForKey: @"DisplayGroupRowRatio"])
-            [self setGroupStatusColumns];
-        
         fMouseControlRow = -1;
         fMouseRevealRow = -1;
@@ -120 +119 @@
     
     [super dealloc];
+}
+
+- (void) awakeFromNib
+{
+    //set group columns to show ratio, needs to be in awakeFromNib to size columns correctly
+    [self setGroupStatusColumns];
 }
 
@@ -818 +823 @@
     
     NSTableColumn * dlTableColumn = [self tableColumnWithIdentifier: @"DL"];
-    if ([dlTableColumn isHidden] == ratio)
-        return;
     
     [dlTableColumn setHidden: ratio];
     [[self tableColumnWithIdentifier: @"DL Image"] setHidden: ratio];
     
-    [[self tableColumnWithIdentifier: @"UL Image"] setWidth: ratio ? 10.0 : 8.0];
-    
-    NSTableColumn * groupTableColumn = [self tableColumnWithIdentifier: @"Group"];
-    [groupTableColumn setWidth: [groupTableColumn width] + (ratio ? -2.0 : 2.0)];
+    //change size of image column
+    NSTableColumn * ulImageTableColumn = [self tableColumnWithIdentifier: @"UL Image"];
+    float oldWidth = [ulImageTableColumn width], newWidth = ratio ? GROUP_RATIO_IMAGE_COLUMN_WIDTH : GROUP_SPEED_IMAGE_COLUMN_WIDTH;
+    if (oldWidth != newWidth)
+    {
+        [ulImageTableColumn setWidth: newWidth];
+        
+        NSTableColumn * groupTableColumn = [self tableColumnWithIdentifier: @"Group"];
+        [groupTableColumn setWidth: [groupTableColumn width] - (newWidth - oldWidth)];
+    }
 }