Changeset 9701

Timestamp:

Dec 10, 2009, 5:16:30 AM (12 years ago)

Author:

livings124

Message:

calculate the message attributes when opening the window, to avoid constant checking for nil

File:

• trunk/macosx/MessageWindowController.m (modified) (2 diffs)

trunk/macosx/MessageWindowController.m

@@ -111 +111 @@
     [fClearButton setFrame: clearButtonFrame];
     
+    fAttributes = [[[[[fMessageTable tableColumnWithIdentifier: @"Message"] dataCell] attributedStringValue]
+                    attributesAtIndex: 0 effectiveRange: NULL] retain];
+    
     //select proper level in popup button
     switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
@@ -251 +254 @@
 - (CGFloat) tableView: (NSTableView *) tableView heightOfRow: (NSInteger) row
 {
+    NSString * message = [[fDisplayedMessages objectAtIndex: row] objectForKey: @"Message"];
+    
     NSTableColumn * column = [tableView tableColumnWithIdentifier: @"Message"];
-    
-    if (!fAttributes)
-        fAttributes = [[[[column dataCell] attributedStringValue] attributesAtIndex: 0 effectiveRange: NULL] retain];
-    
-    NSString * message = [[fDisplayedMessages objectAtIndex: row] objectForKey: @"Message"];
     const CGFloat count = floorf([message sizeWithAttributes: fAttributes].width / [column width]);
     return [tableView rowHeight] * (count + 1.0);