Made the color well cell draw more like ColorWell. Still a ways to go…

…. Also adjusted spacing and made theme selection drop down menu align at the top
iCr · Oct 12, 2011 · 694c5b1 · 694c5b1
1 parent 7da8b84
commit 694c5b1
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 145 deletions.
diff --git a/Strawberry/ColorWellCell.m b/Strawberry/ColorWellCell.m
@@ -66,16 +66,45 @@ - (id)initImageCell:(NSImage *)anImage
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
 {
 	[NSGraphicsContext saveGraphicsState];
-	[[NSColor whiteColor] setStroke];	
+
+    [[NSGraphicsContext currentContext] setShouldAntialias:NO];
+
+	cellFrame = NSInsetRect(cellFrame, 2.0, 2.0);
+	[[NSColor grayColor] setStroke];
+    [NSBezierPath strokeRect:cellFrame];
+
+	cellFrame = NSInsetRect(cellFrame, 1.0, 1.0);
+
+    // FIXME: This should really be a gradient
+    [[NSColor whiteColor] drawSwatchInRect:cellFrame];
+
+	cellFrame = NSInsetRect(cellFrame, 2.0, 2.0);
+	NSColor * color = (NSColor *)[self objectValue];
+    [color drawSwatchInRect:cellFrame];
+	[[NSColor grayColor] setStroke];
+    [NSBezierPath strokeRect:cellFrame];
+
+    /*
 	NSBezierPath * path = [NSBezierPath bezierPathWithRect:cellFrame];
 	[path setLineWidth:1];
 	[path stroke];	
-	cellFrame = NSInsetRect(cellFrame, 2.0, 2.0);
-	NSColor * color = (NSColor *)[self objectValue];
+	cellFrame = NSInsetRect(cellFrame, 1.0, 1.0);
     
+    // FIXME: This should really be a gradient
+    [[NSColor whiteColor] drawSwatchInRect:cellFrame];
+
+	cellFrame = NSInsetRect(cellFrame, 4.0, 4.0);
+
+	[[NSColor grayColor] setStroke];
+    path = [NSBezierPath bezierPathWithRect:cellFrame];
+	[path stroke];	
+    
+	NSColor * color = (NSColor *)[self objectValue];
+	cellFrame = NSInsetRect(cellFrame, 1.0, 1.0);
 	if ( [color respondsToSelector:@selector(setFill)] )
 		[color drawSwatchInRect:cellFrame];
-
+    */
+
 	[NSGraphicsContext restoreGraphicsState];
 }