Changeset 4059


Ignore:
Timestamp:
Dec 4, 2007, 4:47:00 PM (14 years ago)
Author:
livings124
Message:

miscellaneous adjustments

Location:
trunk/macosx
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/BadgeView.m

    r3816 r4059  
    133133    rect.origin.x += (rect.size.width - stringSize.width) * 0.5;
    134134    rect.origin.y += (rect.size.height - stringSize.height) * 0.5;
     135    rect.size = stringSize;
    135136                       
    136     [string drawAtPoint: rect.origin withAttributes: fAttributes];
     137    [string drawInRect: rect withAttributes: fAttributes];
    137138}
    138139
  • trunk/macosx/Badger.m

    r4057 r4059  
    262262    rect.origin.x += (rect.size.width - stringSize.width) * 0.5;
    263263    rect.origin.y += (rect.size.height - stringSize.height) * 0.5;
     264    rect.size = stringSize;
    264265                       
    265     [string drawAtPoint: rect.origin withAttributes: fAttributes];
     266    [string drawInRect: rect withAttributes: fAttributes];
    266267}
    267268
  • trunk/macosx/DragOverlayView.m

    r4058 r4059  
    9292    NSSize badgeSize = [fBadge size];
    9393   
     94    [fBadge lockFocus];
     95   
    9496    //place icon
    95     [fBadge lockFocus];
    96     const float WIDTH = 64.0;
    9797    [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect
    9898            operation: NSCompositeSourceOver fraction: 1.0];
  • trunk/macosx/FilePriorityCell.h

    r3093 r4059  
    2828@interface FilePriorityCell : NSSegmentedCell
    2929{
    30     NSImage * fLowImage, * fHighImage, * fNormalImage, * fMixedImage, * fNoneImage;
    3130}
    3231
  • trunk/macosx/FilePriorityCell.m

    r3478 r4059  
    9393        NSImage * image;
    9494        if (count == 0)
    95         {
    96             if (!fNoneImage)
    97                 fNoneImage = [NSImage imageNamed: @"PriorityNone.png"];
    98             image = fNoneImage;
    99         }
     95            image = [NSImage imageNamed: @"PriorityNone.png"];
    10096        else if (count > 1)
    101         {
    102             if (!fMixedImage)
    103                 fMixedImage = [NSImage imageNamed: @"PriorityMixed.png"];
    104             image = fMixedImage;
    105         }
     97            image = [NSImage imageNamed: @"PriorityMixed.png"];
    10698        else
    10799        {
     
    109101            {
    110102                case TR_PRI_NORMAL:
    111                     if (!fNormalImage)
    112                         fNormalImage = [NSImage imageNamed: @"PriorityNormal.png"];
    113                     image = fNormalImage;
     103                    image = [NSImage imageNamed: @"PriorityNormal.png"];
    114104                    break;
    115105                case TR_PRI_LOW:
    116                     if (!fLowImage)
    117                         fLowImage = [NSImage imageNamed: @"PriorityLow.png"];
    118                     image = fLowImage;
     106                    image = [NSImage imageNamed: @"PriorityLow.png"];
    119107                    break;
    120108                case TR_PRI_HIGH:
    121                     if (!fHighImage)
    122                         fHighImage = [NSImage imageNamed: @"PriorityHigh.png"];
    123                     image = fHighImage;
     109                    image = [NSImage imageNamed: @"PriorityHigh.png"];
    124110                    break;
    125111            }
Note: See TracChangeset for help on using the changeset viewer.