Changeset 2731


Ignore:
Timestamp:
Aug 13, 2007, 5:03:21 AM (15 years ago)
Author:
livings124
Message:

one less warning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/TorrentCell.m

    r2730 r2731  
    5757- (NSImage *) advancedBarSimple;
    5858
    59 #warning rearrange
    6059- (NSRect) rectForMinimalStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
    61 - (NSRect) rectForTitleBasedOnMinimalStatusRect: (NSRect) statusRect withString: (NSAttributedString *) string
     60- (NSRect) rectForTitleWithString: (NSAttributedString *) string basedOnMinimalStatusRect: (NSRect) statusRect
    6261            inBounds: (NSRect) bounds;
    6362- (NSRect) rectForProgressWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
    64 - (NSRect) rectForStatusWithString: (NSAttributedString *) string
    65             inBounds: (NSRect) bounds;
     63- (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
    6664
    6765- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
     
    7573#define BE OSSwapBigToHostConstInt32
    7674
    77 static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
    78                 kBlue = BE(0x50A0FFFF), //80, 160, 255
    79                 kBlue2 = BE(0x1E46B4FF), //30, 70, 180
    80                 kGray  = BE(0x969696FF), //150, 150, 150
     75static uint32_t kRed    = BE(0xFF6450FF), //255, 100, 80
     76                kBlue   = BE(0x50A0FFFF), //80, 160, 255
     77                kBlue2  = BE(0x1E46B4FF), //30, 70, 180
     78                kGray   = BE(0x969696FF), //150, 150, 150
    8179                kGreen1 = BE(0x99FFCCFF), //153, 255, 204
    8280                kGreen2 = BE(0x66FF99FF), //102, 255, 153
    8381                kGreen3 = BE(0x00FF66FF), //0, 255, 102
    84                 kWhite = BE(0xFFFFFFFF); //255, 255, 255
     82                kWhite  = BE(0xFFFFFFFF); //255, 255, 255
    8583
    8684//only called one, so don't worry about release
     
    148146- (NSRect) titleRectForBounds: (NSRect) bounds
    149147{
    150     return [self rectForTitleBasedOnMinimalStatusRect: [self minimalStatusRectForBounds: bounds]
    151                     withString: [self attributedTitleWithColor: nil] inBounds: bounds];
     148    return [self rectForTitleWithString: [self attributedTitleWithColor: nil]
     149            basedOnMinimalStatusRect: [self minimalStatusRectForBounds: bounds] inBounds: bounds];
    152150}
    153151
     
    250248    //title
    251249    NSAttributedString * titleString = [self attributedTitleWithColor: titleColor];
    252     NSRect titleRect = [self rectForTitleBasedOnMinimalStatusRect: minimalStatusRect withString: titleString inBounds: cellFrame];
     250    NSRect titleRect = [self rectForTitleWithString: titleString basedOnMinimalStatusRect: minimalStatusRect inBounds: cellFrame];
    253251    [titleString drawInRect: titleRect];
    254252   
     
    548546}
    549547
    550 - (NSRect) rectForTitleBasedOnMinimalStatusRect: (NSRect) statusRect withString: (NSAttributedString *) string
     548- (NSRect) rectForTitleWithString: (NSAttributedString *) string basedOnMinimalStatusRect: (NSRect) statusRect
    551549            inBounds: (NSRect) bounds
    552550{
Note: See TracChangeset for help on using the changeset viewer.