Changeset 4201

Timestamp:

Dec 18, 2007, 5:05:49 PM (14 years ago)

Author:

livings124

Message:

simplify group coloring

Location:

trunk/macosx

Files:

• GroupsWindowController.h (modified) (1 diff)
• GroupsWindowController.m (modified) (6 diffs)
• TorrentCell.m (modified) (2 diffs)

trunk/macosx/GroupsWindowController.h

@@ -39 +39 @@
 + (GroupsWindowController *) groupsController;
 
-- (NSColor *) colorForIndex: (int) index;
+- (CTGradient *) gradientForIndex: (int) index;
 
 - (int) orderValueForIndex: (int) index;

trunk/macosx/GroupsWindowController.m

@@ -41 +41 @@
 - (void) saveGroups;
 
-- (CTGradient *) gradientForPreviewColor: (NSColor *) color;
+- (CTGradient *) gradientForColor: (NSColor *) color;
 - (void) changeColor: (id) sender;
 
@@ -134 +134 @@
 }
 
-- (NSColor *) colorForIndex: (int) index
+- (CTGradient *) gradientForIndex: (int) index
 {
     if (index < 0)
@@ -143 +143 @@
     while ((dict = [enumerator nextObject]))
         if ([[dict objectForKey: @"Index"] intValue] == index)
-            return [dict objectForKey: @"Color"];
+            return [self gradientForColor: [dict objectForKey: @"Color"]];
     
     return nil;
@@ -169 +169 @@
     NSString * identifier = [tableColumn identifier];
     if ([identifier isEqualToString: @"Color"])
-        return [self gradientForPreviewColor: [[fGroups objectAtIndex: row] objectForKey: @"Color"]];
+        return [self gradientForColor: [[fGroups objectAtIndex: row] objectForKey: @"Color"]];
     else
         return [[fGroups objectAtIndex: row] objectForKey: @"Name"];
@@ -352 +352 @@
         
         [icon lockFocus];
-        [[self gradientForPreviewColor: [dict objectForKey: @"Color"]] fillBezierPath: bp angle: 270.0];
+        [[self gradientForColor: [dict objectForKey: @"Color"]] fillBezierPath: bp angle: 270.0];
         [icon unlockFocus];
         
@@ -376 +376 @@
 }
 
-- (CTGradient *) gradientForPreviewColor: (NSColor *) color
+- (CTGradient *) gradientForColor: (NSColor *) color
 {
     return [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.7 ofColor: [NSColor whiteColor]]

trunk/macosx/TorrentCell.m

@@ -208 +208 @@
     BOOL minimal = [fDefaults boolForKey: @"SmallView"];
     
+    //group coloring
+    NSRect iconRect = [self iconRectForBounds: cellFrame];
+    
     int groupValue = [torrent groupValue];
     if (groupValue != -1)
-    {
-        NSRect groupRect = cellFrame;
-        groupRect.size.width = minimal ? WIDTH_GROUP_MIN : WIDTH_GROUP;
-        groupRect.origin.x -= 1.0;
-        groupRect.size.height += 1.0;
-        groupRect.origin.y -= 1.0;
-        
-        NSColor * color = [[[GroupsWindowController groupsController] colorForIndex: groupValue]
-                            blendedColorWithFraction: 0.3 ofColor: [NSColor whiteColor]];
-        CTGradient * gradient = [CTGradient gradientWithBeginningColor: color endingColor: [color colorWithAlphaComponent: 0.0]];
-        [gradient fillRect: groupRect angle: 0.0];
-    }
+        [[[GroupsWindowController groupsController] gradientForIndex: groupValue] fillBezierPath:
+            [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(iconRect, -2.0, -2.0) radius: 6.0] angle: 90.0];
     
     //error image
@@ -233 +226 @@
     //icon
     NSImage * icon = minimal && error ? fErrorImage : [torrent icon];
-    NSRect iconRect = [self iconRectForBounds: cellFrame];
     [icon drawInRect: iconRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];