Changeset 5834

Timestamp:

May 14, 2008, 9:35:37 PM (14 years ago)

Author:

livings124

Message:

adjust the look of the group colors

Location:

trunk/macosx

Files:

• GroupsController.m (modified) (3 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/GroupsController.m

@@ -34 +34 @@
 - (void) saveGroups;
 
-- (CTGradient *) gradientForColor: (NSColor *) color;
 - (NSImage *) imageForGroup: (NSDictionary *) dict isSmall: (BOOL) small;
 
@@ -133 +132 @@
 {
     int orderIndex = [self rowValueForIndex: index];
-    return orderIndex != -1 ? [self gradientForColor: [[fGroups objectAtIndex: orderIndex] objectForKey: @"Color"]] : nil;
+    //return orderIndex != -1 ? [self gradientForColor: [[fGroups objectAtIndex: orderIndex] objectForKey: @"Color"]] : nil;
+    return [CTGradient gradientWithBeginningColor: [NSColor blueColor] endingColor: [NSColor redColor]];
 }
 
@@ -289 +289 @@
 }
 
-- (CTGradient *) gradientForColor: (NSColor *) color
-{
-    return [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.65 ofColor: [NSColor whiteColor]]
-            endingColor: [color blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]]];
-}
-
 - (NSImage *) imageForGroup: (NSDictionary *) dict isSmall: (BOOL) small
 {
     float width = small ? ICON_WIDTH_SMALL : ICON_WIDTH;
     NSRect rect = NSMakeRect(0.0, 0.0, width, width);
-    NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: rect radius: 4.0];
+    
+    NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: rect radius: 3.0];
     NSImage * icon = [[NSImage alloc] initWithSize: rect.size];
     
+    NSColor * color = [dict objectForKey: @"Color"];
+    
     [icon lockFocus];
-    [[self gradientForColor: [dict objectForKey: @"Color"]] fillBezierPath: bp angle: 270.0];
+    
+    //border
+    CTGradient * gradient = [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.55 ofColor:
+                                [NSColor whiteColor]] endingColor: color];
+    [gradient fillBezierPath: bp angle: 270.0];
+    
+    //inside
+    bp = [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(rect, 1.0, 1.0) radius: 3.0];
+    gradient = [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.75 ofColor: [NSColor whiteColor]]
+                endingColor: [color blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]]];
+    [gradient fillBezierPath: bp angle: 270.0];
+    
     [icon unlockFocus];
     

trunk/macosx/TorrentCell.m

@@ -432 +432 @@
         }
         
-        [[[GroupsController groups] gradientForIndex: groupValue] fillBezierPath:
-            [NSBezierPath bezierPathWithRoundedRect: groupRect radius: 6.0] angle: 90.0];
+        NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue];
+        
+        //border
+        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect radius: 6.0];
+        CTGradient * gradient = [CTGradient gradientWithBeginningColor: [groupColor blendedColorWithFraction: 0.55 ofColor:
+                                [NSColor whiteColor]] endingColor: groupColor];
+        [gradient fillBezierPath: bp angle: 90.0];
+        
+        //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]]];
+        [gradient fillBezierPath: bp angle: 90.0];
     }