Changeset 4059

Timestamp:

Dec 4, 2007, 4:47:00 PM (14 years ago)

Author:

livings124

Message:

miscellaneous adjustments

Location:

trunk/macosx

Files:

• BadgeView.m (modified) (1 diff)
• Badger.m (modified) (1 diff)
• DragOverlayView.m (modified) (1 diff)
• FilePriorityCell.h (modified) (1 diff)
• FilePriorityCell.m (modified) (2 diffs)

trunk/macosx/BadgeView.m

@@ -133 +133 @@
     rect.origin.x += (rect.size.width - stringSize.width) * 0.5;
     rect.origin.y += (rect.size.height - stringSize.height) * 0.5;
+    rect.size = stringSize;
                         
-    [string drawAtPoint: rect.origin withAttributes: fAttributes];
+    [string drawInRect: rect withAttributes: fAttributes];
 }
 

trunk/macosx/Badger.m

@@ -262 +262 @@
     rect.origin.x += (rect.size.width - stringSize.width) * 0.5;
     rect.origin.y += (rect.size.height - stringSize.height) * 0.5;
+    rect.size = stringSize;
                         
-    [string drawAtPoint: rect.origin withAttributes: fAttributes];
+    [string drawInRect: rect withAttributes: fAttributes];
 }
 

trunk/macosx/DragOverlayView.m

@@ -92 +92 @@
     NSSize badgeSize = [fBadge size];
     
+    [fBadge lockFocus];
+    
     //place icon
-    [fBadge lockFocus];
-    const float WIDTH = 64.0;
     [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect
             operation: NSCompositeSourceOver fraction: 1.0];

trunk/macosx/FilePriorityCell.h

@@ -28 +28 @@
 @interface FilePriorityCell : NSSegmentedCell
 {
-    NSImage * fLowImage, * fHighImage, * fNormalImage, * fMixedImage, * fNoneImage;
 }
 

trunk/macosx/FilePriorityCell.m

@@ -93 +93 @@
         NSImage * image;
         if (count == 0)
-        {
-            if (!fNoneImage)
-                fNoneImage = [NSImage imageNamed: @"PriorityNone.png"];
-            image = fNoneImage;
-        }
+            image = [NSImage imageNamed: @"PriorityNone.png"];
         else if (count > 1)
-        {
-            if (!fMixedImage)
-                fMixedImage = [NSImage imageNamed: @"PriorityMixed.png"];
-            image = fMixedImage;
-        }
+            image = [NSImage imageNamed: @"PriorityMixed.png"];
         else
         {
@@ -109 +101 @@
             {
                 case TR_PRI_NORMAL:
-                    if (!fNormalImage)
-                        fNormalImage = [NSImage imageNamed: @"PriorityNormal.png"];
-                    image = fNormalImage;
+                    image = [NSImage imageNamed: @"PriorityNormal.png"];
                     break;
                 case TR_PRI_LOW:
-                    if (!fLowImage)
-                        fLowImage = [NSImage imageNamed: @"PriorityLow.png"];
-                    image = fLowImage;
+                    image = [NSImage imageNamed: @"PriorityLow.png"];
                     break;
                 case TR_PRI_HIGH:
-                    if (!fHighImage)
-                        fHighImage = [NSImage imageNamed: @"PriorityHigh.png"];
-                    image = fHighImage;
+                    image = [NSImage imageNamed: @"PriorityHigh.png"];
                     break;
             }