Changeset 3730

Timestamp:

Nov 6, 2007, 4:53:06 AM (15 years ago)

Author:

livings124

Message:

clean up the pieces bar drawing to avoid putting it into an image, and use NSColor object for the piece colors

Location:

trunk

Files:

• appcast.xml (modified) (2 diffs)
• macosx/Controller.m (modified) (2 diffs)
• macosx/TorrentCell.h (modified) (1 diff)
• macosx/TorrentCell.m (modified) (11 diffs)

trunk/appcast.xml

@@ -7 +7 @@
     <language>en</language>
     <pubDate>Tue, 23 Oct 2007 23:20:00 -0400</pubDate>
-    <lastBuildDate>Mon, 07 Nov 2007 16:45:00 -0400</lastBuildDate>
+    <lastBuildDate>Mon, 05 Nov 2007 16:45:00 -0400</lastBuildDate>
 
         <item>
@@ -25 +25 @@
  <li>Leopard: Fix bug with toggling Minimal View</li>
 </ul>]]></description>
-      <pubDate>Mon, 07 Nov 2007 16:45:00 -0400</pubDate>
-      <enclosure sparkle:version="3711" sparkle:shortVersionString="0.92" url="http://mirrors.m0k.org/transmission/files/Transmission-0.92.dmg" length="2143155" type="application/octet-stream"/>
+      <pubDate>Mon, 05 Nov 2007 16:45:00 -0400</pubDate>
+      <enclosure sparkle:version="3711" sparkle:shortVersionString="0.92" url="http://mirrors.m0k.org/transmission/files/Transmission-0.92.dmg" length="2145246" type="application/octet-stream"/>
     </item>
     

trunk/macosx/Controller.m

@@ -296 +296 @@
     
     //set sort
+    #warning clean up
     NSString * sortType = [fDefaults stringForKey: @"Sort"];
     
@@ -336 +337 @@
     
     //set filter
+    #warning clean up
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
     

trunk/macosx/TorrentCell.h

@@ -36 +36 @@
                 * fGreenGradient, * fLightGreenGradient, * fDarkGreenGradient, * fYellowGradient, * fTransparentGradient;
     
+    NSColor * fGrayColor, * fBlueColor, * fBlue1Color, * fBlue2Color, * fBlue3Color, * fBlue4Color;
+    
     NSBitmapImageRep * fBitmap;
     int8_t * fPieces;

trunk/macosx/TorrentCell.m

@@ -54 +54 @@
 @interface TorrentCell (Private)
 
-// Used to optimize drawing. They contain packed RGBA pixels for every color needed.
-static uint32_t kBlue   = OSSwapBigToHostConstInt32(0x50A0FFFF), //80, 160, 255
-                kBlue1  = OSSwapBigToHostConstInt32(0x84FFFFFF), //204, 255, 255
-                kBlue2  = OSSwapBigToHostConstInt32(0x6BFFFFFF), //153, 255, 255
-                kBlue3  = OSSwapBigToHostConstInt32(0x6B84FFFF), //153, 204, 255
-                kBlue4  = OSSwapBigToHostConstInt32(0x426BFFFF), //102, 153, 255
-                kGray   = OSSwapBigToHostConstInt32(0xE9E9E9FF); //100, 100, 100
-
 - (void) drawBar: (NSRect) barRect;
 - (void) drawRegularBar: (NSRect) barRect;
@@ -96 +88 @@
                                 paragraphStyle, NSParagraphStyleAttributeName, nil];
         [paragraphStyle release];
+        
+        //store box colors
+        fGrayColor = [[NSColor colorWithCalibratedRed: 0.9 green: 0.9 blue: 0.9 alpha: 1.0] retain];
+        fBlue1Color = [[NSColor colorWithCalibratedRed: 0.8 green: 1.0 blue: 1.0 alpha: 1.0] retain];
+        fBlue2Color = [[NSColor colorWithCalibratedRed: 0.6 green: 1.0 blue: 1.0 alpha: 1.0] retain];
+        fBlue3Color = [[NSColor colorWithCalibratedRed: 0.6 green: 0.8 blue: 1.0 alpha: 1.0] retain];
+        fBlue4Color = [[NSColor colorWithCalibratedRed: 0.4 green: 0.6 blue: 1.0 alpha: 1.0] retain];
+        fBlueColor = [[NSColor colorWithCalibratedRed: 0.0 green: 0.4 blue: 0.8 alpha: 1.0] retain];
         
         fBarOverlayColor = [[NSColor colorWithDeviceWhite: 0.0 alpha: 0.2] retain];
@@ -446 +446 @@
             isPlanar: NO colorSpaceName: NSCalibratedRGBColorSpace bytesPerRow: 0 bitsPerPixel: 0];
     
-    uint32_t * p;
-    uint8_t * bitmapData = [fBitmap bitmapData];
-    int bytesPerRow = [fBitmap bytesPerRow];
-    
     if (!fPieces)
     {
@@ -469 +465 @@
     int i, h, index;
     float increment = (float)pieceCount / MAX_PIECES;
-    uint32_t color;
+    NSColor * pieceColor;
     BOOL change;
     for (i = 0; i < MAX_PIECES; i++)
     {
         index = i * increment;
-        change = NO;
+        pieceColor = nil;
         
         if (piecePercent[index] >= 1.0)
@@ -480 +476 @@
             if (fPieces[i] != -1)
             {
-                color = kBlue;
+                pieceColor = fBlueColor;
                 fPieces[i] = -1;
-                change = YES;
             }
         }
@@ -489 +484 @@
             if (fPieces[i] != 0)
             {
-                color = kGray;
+                pieceColor = fGrayColor;
                 fPieces[i] = 0;
-                change = YES;
             }
         }
@@ -498 +492 @@
             if (fPieces[i] != 1)
             {
-                color = kBlue1;
+                pieceColor = fBlue1Color;
                 fPieces[i] = 1;
-                change = YES;
             }
         }
@@ -507 +500 @@
             if (fPieces[i] != 2)
             {
-                color = kBlue2;
+                pieceColor = fBlue2Color;
                 fPieces[i] = 2;
-                change = YES;
             }
         }
@@ -516 +508 @@
             if (fPieces[i] != 3)
             {
-                color = kBlue3;
+                pieceColor = fBlue3Color;
                 fPieces[i] = 3;
-                change = YES;
             }
         }
@@ -525 +516 @@
             if (fPieces[i] != 4)
             {
-                color = kBlue4;
+                pieceColor = fBlue4Color;
                 fPieces[i] = 4;
-                change = YES;
-            }
-        }
-        
-        if (change)
-        {
-            //draw vertically
-            p = (uint32_t *)(bitmapData) + i;
+            }
+        }
+        
+        if (pieceColor)
             for (h = 0; h < barRect.size.height; h++)
-            {
-                p[0] = color;
-                p = (uint32_t *)((uint8_t *)p + bytesPerRow);
-            }
-        }
+                [fBitmap setColor: pieceColor atX: i y: h];
     }
     
@@ -546 +529 @@
     
     //actually draw image
-    NSImage * bar = [[NSImage alloc] initWithSize: [fBitmap size]];
-    [bar setFlipped: YES];
-    [bar addRepresentation: fBitmap];
-    
-    [bar drawInRect: barRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
-    [bar release];
+    [fBitmap drawInRect: barRect];
     
     if (!fTransparentGradient)