Changeset 989 for trunk/macosx/Torrent.m

Timestamp:

Oct 6, 2006, 8:45:59 PM (16 years ago)

Author:

livings124

Message:

Swap green and blue in the advanced bar/pieces view

File:

• trunk/macosx/Torrent.m (modified) (7 diffs)

trunk/macosx/Torrent.m

@@ -51 +51 @@
 
 static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
-                kBlue1 = BE(0xA0DCFFFF), //160, 220, 255
-                kBlue2 = BE(0x78BEFFFF), //120, 190, 255
-                kBlue3 = BE(0x50A0FFFF), //80, 160, 255
-                kBlue4 = BE(0x1E46B4FF), //30, 70, 180
+                kBlue = BE(0x50A0FFFF), //80, 160, 255
+                kBlue2 = BE(0x1E46B4FF), //30, 70, 180
                 kGray  = BE(0x969696FF), //150, 150, 150
-                kGreen = BE(0x00FF00FF), //0, 255, 0
+                kGreen1 = BE(0x99FFCCFF), //153, 255, 204
+                kGreen2 = BE(0x66FF99FF), //102, 255, 153
+                kGreen3 = BE(0x00FF66FF), //0, 255, 102
                 kWhite = BE(0xFFFFFFFF); //255, 255, 255
 
@@ -854 +854 @@
     [self getAvailability: pieces size: MAX_PIECES];
     
-    //lines 2 to 14: blue or grey depending on whether we have the piece or not
+    //lines 2 to 14: blue, green, or gray depending on whether we have the piece or not
     int have = 0, avail = 0;
     uint32_t color;
@@ -865 +865 @@
             if (fPieces[w] != -1)
             {
-                color = kGreen;
+                color = kBlue;
                 fPieces[w] = -1;
                 change = YES;
@@ -886 +886 @@
                 if (fPieces[w] != 1)
                 {
-                    color = kBlue1;
+                    color = kGreen1;
                     fPieces[w] = 1;
                     change = YES;
@@ -895 +895 @@
                 if (fPieces[w] != 2)
                 {
-                    color = kBlue2;
+                    color = kGreen2;
                     fPieces[w] = 2;
                     change = YES;
@@ -904 +904 @@
                 if (fPieces[w] != 3)
                 {
-                    color = kBlue3;
+                    color = kGreen3;
                     fPieces[w] = 3;
                     change = YES;
@@ -928 +928 @@
     for (w = 0; w < have; w++)
     {
-        p[w] = kBlue4;
-        p[w + bytesPerRow / 4] = kBlue4;
+        p[w] = kBlue2;
+        p[w + bytesPerRow / 4] = kBlue2;
     }
     for (; w < avail + have; w++)
     {
-        p[w] = kGreen;
-        p[w + bytesPerRow / 4] = kGreen;
+        p[w] = kGreen3;
+        p[w + bytesPerRow / 4] = kGreen3;
     }
     for (; w < MAX_PIECES; w++)