Changeset 924

Timestamp:

Sep 25, 2006, 9:20:08 PM (16 years ago)

Author:

livings124

Message:

Use setNeedsDisplay rather than resetting the image on each refresh.

Location:

trunk

Files:

• PiecesView.h (modified) (1 diff)
• PiecesView.m (modified) (7 diffs)

trunk/PiecesView.h

@@ -14 +14 @@
     int8_t  * fPieces;
     
-    NSImage * fExistingImage, * fBack, * fWhitePiece, * fGreenPiece,
+    NSImage * fBack, * fWhitePiece, * fGreenPiece,
             * fBlue1Piece, * fBlue2Piece, * fBlue3Piece;
     

trunk/PiecesView.m

@@ -49 +49 @@
         [fBlue3Piece setScalesWhenResized: YES];
         [fBlue3Piece setSize: size];
-        
-        fExistingImage = [fBack copy];
     }
     
@@ -62 +60 @@
     if (fTorrent)
         [fTorrent release];
-    [fExistingImage release];
     [super dealloc];
 }
@@ -75 +72 @@
         {
             fTorrent = nil;
-            [fImageView setImage: fBack];
+            [fImageView setImage: [[fBack copy] autorelease]];
         }
     }
@@ -96 +93 @@
             fAcross = MAX_ACROSS;
         
-        fWidth = ([fExistingImage size].width - (fAcross + 1) * BETWEEN) / fAcross;
-        fExtraBorder = ([fExistingImage size].width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
+        fWidth = ([[fImageView image] size].width - (fAcross + 1) * BETWEEN) / fAcross;
+        fExtraBorder = ([[fImageView image] size].width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
         
         [self updateView: YES];
@@ -109 +106 @@
     
     if (first)
-    {
-        [fExistingImage release];
-        fExistingImage = [fBack copy];
-    }
+        [fImageView setImage: [[fBack copy] autorelease]];
+    
+    NSImage * image = [fImageView image];
     
     int8_t * pieces = malloc(fNumPieces);
@@ -179 +175 @@
                 if (!change)
                 {
-                    [fExistingImage lockFocus];
+                    [image lockFocus];
                     change = YES;
                 }
                 
                 point = NSMakePoint(j * (fWidth + BETWEEN) + BETWEEN + fExtraBorder,
-                                    [fExistingImage size].width - (i + 1) * (fWidth + BETWEEN) - fExtraBorder);
+                                    [[fImageView image] size].width - (i + 1) * (fWidth + BETWEEN) - fExtraBorder);
                 
                 [pieceImage compositeToPoint: point fromRect: rect operation: NSCompositeSourceOver];
@@ -192 +188 @@
     if (change)
     {
-        [fExistingImage unlockFocus];
-        
-        [fImageView setImage: nil];
-        [fImageView setImage: fExistingImage];
+        [image unlockFocus];
+        [fImageView setNeedsDisplay];
     }