Changeset 9317

Timestamp:

Oct 18, 2009, 1:54:13 AM (13 years ago)

Author:

livings124

Message:

don't store a copy of the pieces view's background - regenerate it when needed instead

Location:

trunk/macosx

Files:

• NSStringAdditions.m (modified) (1 diff)
• PiecesView.h (modified) (1 diff)
• PiecesView.m (modified) (3 diffs)

trunk/macosx/NSStringAdditions.m

@@ -116 +116 @@
 {
     NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: MIN(max, 4)];
-    NSUInteger remaining = seconds;
+    uint64_t remaining = seconds;
     
     if (max > 0 && seconds >= (24 * 60 * 60))

trunk/macosx/PiecesView.h

@@ -31 +31 @@
     int8_t  * fPieces;
     
-    NSImage * fBack;
     NSColor * fGreenAvailabilityColor, * fBluePieceColor;
     

trunk/macosx/PiecesView.m

@@ -43 +43 @@
 - (void) awakeFromNib
 {
-    //back image
-    fBack = [[NSImage alloc] initWithSize: [self bounds].size];
-    
-    [fBack lockFocus];
-    NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [NSColor colorWithCalibratedWhite: 0.0f alpha: 0.4f]
-                                endingColor: [NSColor colorWithCalibratedWhite: 0.2f alpha: 0.4f]];
-    [gradient drawInRect: [self bounds] angle: 90.0f];
-    [gradient release];
-    [fBack unlockFocus];
-    
     //store box colors
-    fGreenAvailabilityColor = [[NSColor colorWithCalibratedRed: 0.0f green: 1.0f blue: 0.4f alpha: 1.0f] retain];
-    fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0f green: 0.4f blue: 0.8f alpha: 1.0f] retain];
-            
+    fGreenAvailabilityColor = [[NSColor colorWithCalibratedRed: 0.0 green: 1.0 blue: 0.4 alpha: 1.0] retain];
+    fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0 green: 0.4 blue: 0.8 alpha: 1.0] retain];
+    
     //actually draw the box
     [self setTorrent: nil];
@@ -64 +54 @@
 {
     tr_free(fPieces);
-    
-    [fBack release];
     
     [fGreenAvailabilityColor release];
@@ -89 +77 @@
     }
     
-    //reset the view to blank
-    NSImage * newBack = [fBack copy];
-    [self setImage: newBack];
-    [newBack release];
+    NSImage * back = [[NSImage alloc] initWithSize: [self bounds].size];
+    [back lockFocus];
+    
+    NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.4]
+                                endingColor: [NSColor colorWithCalibratedWhite: 0.2 alpha: 0.4]];
+    [gradient drawInRect: [self bounds] angle: 90.0];
+    [gradient release];
+    [back unlockFocus];
+    
+    [self setImage: back];
+    [back release];
     
     [self setNeedsDisplay];