Changeset 4192

Timestamp:

Dec 18, 2007, 1:44:37 AM (14 years ago)

Author:

livings124

Message:

experiment with moving the label from over the text to the left edge

Location:

trunk/macosx

Files:

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

trunk/macosx/GroupsWindowController.h

@@ -34 +34 @@
     IBOutlet NSSegmentedControl * fAddRemoveControl;
     
-    NSMutableDictionary * fCurrentColorDict, * fGroupGradients;
+    NSMutableDictionary * fCurrentColorDict;
 }
 

trunk/macosx/GroupsWindowController.m

@@ -375 +375 @@
 - (CTGradient *) gradientForColor: (NSColor *) color
 {
-    return [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.7 ofColor: [NSColor whiteColor]]
-            endingColor: [color blendedColorWithFraction: 0.4 ofColor: [NSColor whiteColor]]];
+    return [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]]
+            endingColor: [color blendedColorWithFraction: 0.7 ofColor: [NSColor whiteColor]]];
 }
 

trunk/macosx/TorrentCell.m

@@ -52 +52 @@
 #define PADDING_BETWEEN_BAR_AND_STATUS 2.0
 
-#define GROUP_BORDER_X 4.0
-#define GROUP_BORDER_Y 1.0
-
 #define MAX_PIECES 324
 #define BLANK_PIECE -99
@@ -200 +197 @@
 }
 
-- (void) drawInteriorWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
-{
-    [super drawInteriorWithFrame: cellFrame inView: controlView];
+- (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
+{
+    [super drawWithFrame: cellFrame inView: controlView];
     
     Torrent * torrent = [self representedObject];
     
     BOOL minimal = [fDefaults boolForKey: @"SmallView"];
+    
+    int groupValue = [torrent groupValue];
+    if (groupValue != -1)
+    {
+        NSRect groupRect = cellFrame;
+        groupRect.size.width = 38.0;
+        groupRect.origin.x -= 1.0;
+        groupRect.size.height += 1.0;
+        groupRect.origin.y -= 1.0;
+        
+        [[[GroupsWindowController groupsController] gradientForIndex: groupValue] fillRect: groupRect angle: 270];
+    }
     
     //error image
@@ -229 +238 @@
     
     //text color
+    NSColor * titleColor, * statusColor;
     BOOL selected = [NSApp isOnLeopardOrBetter] ? [self backgroundStyle] == NSBackgroundStyleDark : [self isHighlighted]
                     && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]];
-    int groupIndex = [torrent groupValue];
-    
-    NSColor * titleColor = selected && groupIndex == -1 ? [NSColor whiteColor] : [NSColor controlTextColor],
-            * statusColor = selected ? [NSColor whiteColor] : [NSColor darkGrayColor];
+    if ([NSApp isOnLeopardOrBetter] ? [self backgroundStyle] == NSBackgroundStyleDark : [self isHighlighted]
+        && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
+    {
+        titleColor = [NSColor whiteColor];
+        statusColor = [NSColor whiteColor];
+    }
+    else
+    {
+        titleColor = [NSColor controlTextColor];
+        statusColor = [NSColor darkGrayColor];
+    }
     
     //minimal status
@@ -251 +268 @@
     NSAttributedString * titleString = [self attributedTitleWithColor: titleColor];
     NSRect titleRect = [self rectForTitleWithString: titleString basedOnMinimalStatusRect: minimalStatusRect inBounds: cellFrame];
-    
-    if (groupIndex != -1)
-        [[[GroupsWindowController groupsController] gradientForIndex: [torrent groupValue]] fillBezierPath:
-            [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(titleRect, -GROUP_BORDER_X, -GROUP_BORDER_Y) radius: 7.0] angle: 90];
-    
     [titleString drawInRect: titleRect];
     
@@ -561 +573 @@
     result.size = [string size];
     result.size.width = MIN(result.size.width, NSMaxX(bounds) - result.origin.x - PADDING_HORIZONAL
-                            - ([[self representedObject] groupValue] != -1 ? GROUP_BORDER_X : 0)
                             - (minimal ? PADDING_BETWEEN_TITLE_AND_MIN_STATUS + statusRect.size.width : 0));