Clean up download item look, part 1 of many.

chrome/browser/cocoa/download_item_cell.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/download_item_cell.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/download_item_cell.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
 namespace {
 
 // Distance from top border to icon
-const CGFloat kImagePaddingTop = 1;
+const CGFloat kImagePaddingTop = 8;
 
 // Distance from left border to icon
-const CGFloat kImagePaddingLeft = 1;
+const CGFloat kImagePaddingLeft = 5;
 
 // Width of icon
-const CGFloat kImageWidth = 32;
+const CGFloat kImageWidth = 16;
 
 // Height of icon
-const CGFloat kImageHeight = 32;
+const CGFloat kImageHeight = 16;
 
 // x coordinate of download name string, in view coords
-const CGFloat kTextPosLeft = kImagePaddingLeft + kImageWidth + 1;
+const CGFloat kTextPosLeft = kImagePaddingLeft + kImageWidth + 4 + 1;
 
 // Distance from end of download name string to dropdown area
 const CGFloat kTextPaddingRight = 3;
 
 // y coordinate of download name string, in view coords, when status message
 // is visible
 const CGFloat kPrimaryTextPosTop = 5;
 
 // y coordinate of download name string, in view coords, when status message
 // is not visible
 const CGFloat kPrimaryTextOnlyPosTop = 10;
 
 // y coordinate of status message, in view coords
 const CGFloat kSecondaryTextPosTop = 17;
 
-// Width of dropdown area on the right
-const CGFloat kDropdownAreaWidth = 18;
+// Width of dropdown area on the right (includes 1px for the border on each
+// side).
+const CGFloat kDropdownAreaWidth = 14;
 
 // Width of dropdown arrow
 const CGFloat kDropdownArrowWidth = 5;
 
 // Height of dropdown arrow
 const CGFloat kDropdownArrowHeight = 3;
 
 // Duration of the two-lines-to-one-line animation, in seconds
 NSTimeInterval kHideStatusDuration = 0.3;
 
@@ skipping 194 matching lines @@
   gfx::Font font_chr =
       gfx::Font::CreateFont(base::SysNSStringToWide([font fontName]),
                             [font pointSize]);
 
   NSString* titleString = base::SysWideToNSString(
       ElideFilename(downloadPath_, font_chr, availableWidth));
   [self setTitle:titleString];
 }
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
-
-  // Constants from Cole.  Will kConstan them once the feedback loop
+  // Constants from Cole.  Will kConstant them once the feedback loop
   // is complete.
   NSRect drawFrame = NSInsetRect(cellFrame, 0.5, 0.5);
   NSRect innerFrame = NSInsetRect(cellFrame, 1, 1);
 
-  const float radius = 3.5;
+  const float radius = 5;
   NSWindow* window = [controlView window];
   BOOL active = [window isKeyWindow] || [window isMainWindow];
 
   GTMTheme* theme = [controlView gtm_theme];
 
   NSRect buttonDrawRect, dropdownDrawRect;
   NSDivideRect(drawFrame, &dropdownDrawRect, &buttonDrawRect,
       kDropdownAreaWidth, NSMaxXEdge);
 
-  NSRect buttonInnerRect, dropdownInnerRect;
-  NSDivideRect(innerFrame, &dropdownInnerRect, &buttonInnerRect,
-      kDropdownAreaWidth, NSMaxXEdge);
-
   NSBezierPath* buttonInnerPath = [self
       leftRoundedPath:radius inRect:buttonDrawRect];
   NSBezierPath* buttonOuterPath = [self
       leftRoundedPath:(radius + 1)
                inRect:NSInsetRect(buttonDrawRect, -1, -1)];
 
   NSBezierPath* dropdownInnerPath = [self
       rightRoundedPath:radius inRect:dropdownDrawRect];
   NSBezierPath* dropdownOuterPath = [self
       rightRoundedPath:(radius + 1)
                 inRect:NSInsetRect(dropdownDrawRect, -1, -1)];
 
-  // Stroke the borders and appropriate fill gradient. If we're borderless,
-  // the only time we want to draw the inner gradient is if we're highlighted.
-  if ([self isHighlighted] || [self isMouseInside]) {
-    [self drawBorderAndFillForTheme:theme
-                        controlView:controlView
-                          outerPath:buttonOuterPath
-                          innerPath:buttonInnerPath
-              showHighlightGradient:[self isMouseOverButtonPart]
-                showClickedGradient:[self isButtonPartPressed]
-                             active:active
-                          cellFrame:cellFrame];
+  // Stroke the borders and appropriate fill gradient.
+  [self drawBorderAndFillForTheme:theme
+                      controlView:controlView
+                        outerPath:buttonOuterPath
+                        innerPath:buttonInnerPath
+            showHighlightGradient:[self isMouseOverButtonPart]
+              showClickedGradient:[self isButtonPartPressed]
+                           active:active
+                        cellFrame:cellFrame];
 
-    [self drawBorderAndFillForTheme: theme
-                        controlView:controlView
-                          outerPath:dropdownOuterPath
-                          innerPath:dropdownInnerPath
-              showHighlightGradient:[self isMouseOverDropdownPart]
-                showClickedGradient:[self isDropdownPartPressed]
-                             active:active
-                          cellFrame:cellFrame];
-  }
+  [self drawBorderAndFillForTheme: theme
+                      controlView:controlView
+                        outerPath:dropdownOuterPath
+                        innerPath:dropdownInnerPath
+            showHighlightGradient:[self isMouseOverDropdownPart]
+              showClickedGradient:[self isDropdownPartPressed]
+                           active:active
+                        cellFrame:cellFrame];
 
   [self drawInteriorWithFrame:innerFrame inView:controlView];
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   // Draw title
   [self elideTitle:cellFrame.size.width -
       (kTextPosLeft + kTextPaddingRight + kDropdownAreaWidth)];
 
   NSColor* color = [self isButtonPartPressed]
@@ skipping 31 matching lines @@
   NSRect imageRect = NSZeroRect;
   imageRect.size = [[self image] size];
   [[self image] setFlipped:[controlView isFlipped]];
   [[self image] drawInRect:[self imageRectForBounds:cellFrame]
                   fromRect:imageRect
                  operation:NSCompositeSourceOver
                   fraction:[self isEnabled] ? 1.0 : 0.5];
 
   // Popup arrow. Put center of mass of the arrow in the center of the
   // dropdown area.
-  CGFloat cx = NSMaxX(cellFrame) - kDropdownAreaWidth/2;
+  CGFloat cx = NSMaxX(cellFrame) - kDropdownAreaWidth/2 + 0.5;
   CGFloat cy = NSMidY(cellFrame);
   NSPoint p1 = NSMakePoint(cx - kDropdownArrowWidth/2,
                            cy - kDropdownArrowHeight/3);
   NSPoint p2 = NSMakePoint(cx + kDropdownArrowWidth/2,
                            cy - kDropdownArrowHeight/3);
   NSPoint p3 = NSMakePoint(cx, cy + kDropdownArrowHeight*2/3);
   NSBezierPath *triangle = [NSBezierPath bezierPath];
   [triangle moveToPoint:p1];
   [triangle lineToPoint:p2];
   [triangle lineToPoint:p3];
@@ skipping 46 matching lines @@
   }
   return self;
 }
 
 - (void)setCurrentProgress:(NSAnimationProgress)progress {
   [super setCurrentProgress:progress];
   [cell_ animationProgressed:progress];
 }
 
 @end