diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m index 12f41159d..e01cb5224 100644 --- a/macosx/PiecesView.m +++ b/macosx/PiecesView.m @@ -28,7 +28,7 @@ #import "utils.h" #define MAX_ACROSS 18 -#define BETWEEN 1.0f +#define BETWEEN 1.0 #define HIGH_PEERS 30 @@ -108,17 +108,14 @@ return; //determine if first time - BOOL first = NO; - if (!fPieces) - { + const BOOL first = fPieces == NULL; + if (first) fPieces = (int8_t *)tr_malloc(fNumPieces * sizeof(int8_t)); - first = YES; - } int8_t * pieces = NULL; float * piecesPercent = NULL; - BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]; + const BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]; if (showAvailablity) { pieces = (int8_t *)tr_malloc(fNumPieces * sizeof(int8_t)); @@ -135,7 +132,7 @@ NSRect fillRects[fNumPieces]; NSColor * fillColors[fNumPieces]; - NSInteger index = -1, usedIndex = 0; + NSInteger index = -1, usedCount = 0; for (NSInteger i = 0; i < fAcross; i++) for (NSInteger j = 0; j < fAcross; j++) @@ -192,19 +189,19 @@ if (pieceColor) { - fillRects[usedIndex] = NSMakeRect(j * (fWidth + BETWEEN) + BETWEEN + fExtraBorder, + fillRects[usedCount] = NSMakeRect(j * (fWidth + BETWEEN) + BETWEEN + fExtraBorder, [image size].width - (i + 1) * (fWidth + BETWEEN) - fExtraBorder, fWidth, fWidth); - fillColors[usedIndex] = pieceColor; + fillColors[usedCount] = pieceColor; - usedIndex++; + usedCount++; } } - if (usedIndex > 0) + if (usedCount > 0) { [image lockFocus]; - NSRectFillListWithColors(fillRects, fillColors, usedIndex); + NSRectFillListWithColors(fillRects, fillColors, usedCount); [image unlockFocus]; [self setNeedsDisplay]; } diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index f2c8a9701..3ff88f19d 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -39,9 +39,6 @@ #define ACTION_MENU_PRIORITY_NORMAL_TAG 102 #define ACTION_MENU_PRIORITY_LOW_TAG 103 -#define GROUP_SPEED_IMAGE_COLUMN_WIDTH 8.0f -#define GROUP_RATIO_IMAGE_COLUMN_WIDTH 10.0f - #define TOGGLE_PROGRESS_SECONDS 0.175 @interface TorrentTableView (Private) @@ -945,21 +942,10 @@ - (void) setGroupStatusColumns { - BOOL ratio = [fDefaults boolForKey: @"DisplayGroupRowRatio"]; + const BOOL ratio = [fDefaults boolForKey: @"DisplayGroupRowRatio"]; [[self tableColumnWithIdentifier: @"DL"] setHidden: ratio]; [[self tableColumnWithIdentifier: @"DL Image"] setHidden: ratio]; - - //change size of image column - NSTableColumn * ulImageTableColumn = [self tableColumnWithIdentifier: @"UL Image"]; - CGFloat 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)]; - } } - (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib index eb163e13d..9fc213569 100644 --- a/macosx/en.lproj/MainMenu.xib +++ b/macosx/en.lproj/MainMenu.xib @@ -2,9 +2,9 @@ 1050 - 10A432 + 10B504 732 - 1038 + 1038.2 437.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -12,6 +12,8 @@ YES + + @@ -51,7 +53,7 @@ {1.79769e+308, 1.79769e+308} {350, 5} - + 256 YES @@ -212,7 +214,7 @@ 256 - {468, 173} + {472, 173} YES @@ -647,9 +649,9 @@ IDIwMDkAA DL Image - 8 - 8 - 3.4028229999999999e+38 + 10 + 10 + 10 75628096 2048 @@ -663,7 +665,7 @@ IDIwMDkAA 33685504 - 0 + 8 0 0 NO @@ -673,8 +675,8 @@ IDIwMDkAA DL 64 - 10 - 3.4028229999999999e+38 + 64 + 64 75628096 2048 @@ -701,9 +703,9 @@ IDIwMDkAA UL Image - 8 - 8 - 3.4028229999999999e+38 + 10 + 10 + 10 75628096 2048 @@ -717,7 +719,7 @@ IDIwMDkAA 33685504 - 0 + 8 0 0 NO @@ -727,8 +729,8 @@ IDIwMDkAA UL 64 - 10 - 3.4028229999999999e+38 + 64 + 64 75628096 2048 @@ -783,13 +785,14 @@ IDIwMDkAA _doScroller: - 0.9942529 + 0.99425287356321834 -2147483392 {{-100, -100}, {451, 15}} + YES 1 _doScroller: @@ -799,7 +802,7 @@ IDIwMDkAA {{0, 23}, {468, 173}} - 528 + 656 @@ -807,6 +810,7 @@ IDIwMDkAA {468, 196} + {{0, 0}, {1680, 1028}} {350, 27} @@ -2159,14 +2163,14 @@ IDIwMDkAA - + 266 YES 257 - {{260, 4}, {64, 14}} + {{258, 4}, {64, 14}} YES @@ -2242,7 +2246,7 @@ IDIwMDkAA NeXT TIFF v4.0 pasteboard type - {{249, 5}, {8, 12}} + {{247, 5}, {8, 12}} YES @@ -2327,6 +2331,7 @@ IDIwMDkAA {400, 21} + StatusBarView NSView @@ -8233,7 +8238,7 @@ IDIwMDkAA - 3213 + 3214