mirror of
https://github.com/transmission/transmission
synced 2025-02-07 15:04:13 +00:00
calculate the message attributes when opening the window, to avoid constant checking for nil
This commit is contained in:
parent
9fb6c5b1c4
commit
9888043e13
1 changed files with 5 additions and 5 deletions
|
@ -110,6 +110,9 @@
|
||||||
clearButtonFrame.origin.x -= clearButtonFrame.size.width - oldClearButtonWidth;
|
clearButtonFrame.origin.x -= clearButtonFrame.size.width - oldClearButtonWidth;
|
||||||
[fClearButton setFrame: clearButtonFrame];
|
[fClearButton setFrame: clearButtonFrame];
|
||||||
|
|
||||||
|
fAttributes = [[[[[fMessageTable tableColumnWithIdentifier: @"Message"] dataCell] attributedStringValue]
|
||||||
|
attributesAtIndex: 0 effectiveRange: NULL] retain];
|
||||||
|
|
||||||
//select proper level in popup button
|
//select proper level in popup button
|
||||||
switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
|
switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
|
||||||
{
|
{
|
||||||
|
@ -250,12 +253,9 @@
|
||||||
#warning don't cut off end
|
#warning don't cut off end
|
||||||
- (CGFloat) tableView: (NSTableView *) tableView heightOfRow: (NSInteger) row
|
- (CGFloat) tableView: (NSTableView *) tableView heightOfRow: (NSInteger) row
|
||||||
{
|
{
|
||||||
NSTableColumn * column = [tableView tableColumnWithIdentifier: @"Message"];
|
|
||||||
|
|
||||||
if (!fAttributes)
|
|
||||||
fAttributes = [[[[column dataCell] attributedStringValue] attributesAtIndex: 0 effectiveRange: NULL] retain];
|
|
||||||
|
|
||||||
NSString * message = [[fDisplayedMessages objectAtIndex: row] objectForKey: @"Message"];
|
NSString * message = [[fDisplayedMessages objectAtIndex: row] objectForKey: @"Message"];
|
||||||
|
|
||||||
|
NSTableColumn * column = [tableView tableColumnWithIdentifier: @"Message"];
|
||||||
const CGFloat count = floorf([message sizeWithAttributes: fAttributes].width / [column width]);
|
const CGFloat count = floorf([message sizeWithAttributes: fAttributes].width / [column width]);
|
||||||
return [tableView rowHeight] * (count + 1.0);
|
return [tableView rowHeight] * (count + 1.0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue