Changeset 14 for trunk/Cocoa/F-Script Anywhere/Source/NJRLabeledImageCell.m

Timestamp:

10/20/02 04:41:17 (22 years ago)

Author:

Nicholas Riley

Message:

F-Script Anywhere 1.1.2

File:

• trunk/Cocoa/F-Script Anywhere/Source/NJRLabeledImageCell.m (modified) (3 diffs)

trunk/Cocoa/F-Script Anywhere/Source/NJRLabeledImageCell.m

@@ -96 +96 @@
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
     if (image != nil) {
-        NSSize  imageSize, repSize;
+        NSSize  imageSize;
         NSRect  imageFrame;
-        NSArray *imageReps;
-        int i, repCount;
         NSImageRep *preferredRep, *rep;
 
@@ -107 +105 @@
         if (preferredRep != nil && abs([preferredRep size].width - imageSize.width) < 1 && abs([preferredRep size].height != imageSize.height) < 1) {
             [self setImage: [imageCacheSource cachedImage]];
-            // NSLog(@"%@ accepting cached image: %@", [self stringValue], preferredRep);
+            FSALog(@"%@ accepting cached image: %@", [self stringValue], preferredRep);
         } else {
-            // NSLog(@"%@ rejecting cached image: %@", [self stringValue], preferredRep);
-            imageReps = [image representations];
-            repCount = [imageReps count];
+            NSArray     *imageReps = [image representations];
+            int         i, repCount = [imageReps count];
+            NSSize      repSize;
+            
             preferredRep = [imageReps objectAtIndex: 0];
+            FSALog(@"%@ rejecting cached image: %@", [self stringValue], preferredRep);
             for (i = 1 ; i < repCount ; i++) {
                 rep = [imageReps objectAtIndex: i];
@@ -140 +140 @@
             */
             // Begin workaround code for bug in OS X 10.1 (removeRepresentation: has no effect)
-            // This uses a lot more memory because the icons aren't shared - punting.
             if ([preferredRep size].width > imageSize.width || [preferredRep size].height > imageSize.height) {
                 NSImage *scaledImage = [[NSImage alloc] initWithSize: imageSize];
                 NSRect rect = { NSZeroPoint, imageSize };
-                // NSLog(@"rescaling %@", [self stringValue]);
+                FSALog(@"rescaling %@", [self stringValue]);
+                [scaledImage setFlipped: [controlView isFlipped]]; // XXX this works, but is correct?
                 [scaledImage lockFocus];
                 [preferredRep drawInRect: rect];