Changeset 5946

Timestamp:

May 27, 2008, 4:07:12 PM (14 years ago)

Author:

livings124

Message:

simplify the drawing of group colors for transfers

Location:

trunk/macosx

Files:

• TorrentCell.h (modified) (1 diff)
• TorrentCell.m (modified) (4 diffs)

trunk/macosx/TorrentCell.h

@@ -35 +35 @@
             fHoverControl, fHoverReveal, fHoverAction;
     
-    NSColor * fBarOverlayColor;
+    NSColor * fBarBorderColor;
     CTGradient * fWhiteGradient, * fGrayGradient, * fLightGrayGradient, * fBlueGradient, * fDarkBlueGradient, 
                 * fGreenGradient, * fLightGreenGradient, * fDarkGreenGradient, * fYellowGradient, * fRedGradient;

trunk/macosx/TorrentCell.m

@@ -107 +107 @@
         fOrangeColor = [[NSColor orangeColor] retain];
         
-        fBarOverlayColor = [[NSColor colorWithDeviceWhite: 0.0 alpha: 0.2] retain];
+        fBarBorderColor = [[NSColor colorWithDeviceWhite: 0.0 alpha: 0.2] retain];
     }
         return self;
@@ -426 +426 @@
     if (groupValue != -1)
     {
-        NSRect groupRect = NSInsetRect(iconRect, -2.0, -3.0);
+        NSRect groupRect = NSInsetRect(iconRect, -1.0, -2.0);
         if (!minimal)
         {
@@ -432 +432 @@
             groupRect.origin.y--;
         }
-        
-        NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue];
+        float radius = minimal ? 3.0 : 6.0;
+        
+        NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],
+                * darkGroupColor = [groupColor blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]];
         
         //border
-        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect radius: 6.0];
-        CTGradient * gradient = [CTGradient gradientWithBeginningColor: [groupColor blendedColorWithFraction: 0.45 ofColor:
-                                [NSColor whiteColor]] endingColor: groupColor];
-        [gradient fillBezierPath: bp angle: 90.0];
+        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect radius: radius];
+        [darkGroupColor set];
+        [bp setLineWidth: 1.5];
+        [bp stroke];
         
         //inside
-        bp = [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(groupRect, 1.0, 1.0) radius: 6.0];
-        gradient = [CTGradient gradientWithBeginningColor: [groupColor blendedColorWithFraction: 0.65 ofColor: [NSColor whiteColor]]
-                    endingColor: [groupColor blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]]];
+        bp = [NSBezierPath bezierPathWithRoundedRect: groupRect radius: radius];
+        CTGradient * gradient = [CTGradient gradientWithBeginningColor: [groupColor blendedColorWithFraction: 0.7
+                                    ofColor: [NSColor whiteColor]] endingColor: darkGroupColor];
         [gradient fillBezierPath: bp angle: 90.0];
     }
@@ -600 +602 @@
     }
     
-    [fBarOverlayColor set];
+    [fBarBorderColor set];
     [NSBezierPath strokeRect: NSInsetRect(barRect, 0.5, 0.5)];
 }