Final tweaks to download items on OS X.

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/canvas_paint.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"
 #include "chrome/browser/download/download_util.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
 namespace {
 
 // Distance from top border to icon
 const CGFloat kImagePaddingTop = 7;
 
 // Distance from left border to icon
-const CGFloat kImagePaddingLeft = 8;
+const CGFloat kImagePaddingLeft = 9;
 
 // Width of icon
 const CGFloat kImageWidth = 16;
 
 // Height of icon
 const CGFloat kImageHeight = 16;
 
 // x coordinate of download name string, in view coords
 const CGFloat kTextPosLeft = kImagePaddingLeft +
     kImageWidth + download_util::kSmallProgressIconOffset;
 
 // 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;
+const CGFloat kPrimaryTextPosTop = 3;
 
 // 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;
+const CGFloat kSecondaryTextPosTop = 18;
+
+// Grey value of status text
+const CGFloat kSecondaryTextColor = 0.5;
 
 // 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;
 
+// Vertical displacement of dropdown area, relative to the "centered" position.
+const CGFloat kDropdownAreaY = -2;
+
 // Duration of the two-lines-to-one-line animation, in seconds
 NSTimeInterval kHideStatusDuration = 0.3;
 
 // Duration of the 'download complete' animation, in seconds
 const int kCompleteAnimationDuration = 2.5;
 
 }
 
 // This is a helper class to animate the fading out of the status text.
 @interface DownloadItemCellAnimation : NSAnimation {
   DownloadItemCell* cell_;
 }
 - (id)initWithDownloadItemCell:(DownloadItemCell*)cell
                       duration:(NSTimeInterval)duration
                 animationCurve:(NSAnimationCurve)animationCurve;
 @end
 
 @interface DownloadItemCell(Private)
 - (void)updateTrackingAreas:(id)sender;
 - (void)hideSecondaryTitle;
 - (void)animation:(NSAnimation*)animation
        progressed:(NSAnimationProgress)progress;
+- (NSString*)elideTitle:(int)availableWidth;
+- (NSString*)elideStatus:(int)availableWidth;
 @end
 
 @implementation DownloadItemCell
 
 @synthesize secondaryTitle = secondaryTitle_;
 @synthesize secondaryFont = secondaryFont_;
 
 - (void)setInitialState {
   isStatusTextVisible_ = NO;
   titleY_ = kPrimaryTextPosTop;
   statusAlpha_ = 1.0;
 
   [self setFont:[NSFont systemFontOfSize:
       [NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
   [self setSecondaryFont:[NSFont systemFontOfSize:
-      [NSFont systemFontSizeForControlSize:NSMiniControlSize]]];
+      [NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
 
   [self updateTrackingAreas:self];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(updateTrackingAreas:)
              name:NSViewFrameDidChangeNotification
            object:[self controlView]];
 }
 
 // For nib instantiations
@@ skipping 170 matching lines @@
 
   NSBezierPath* path = [NSBezierPath bezierPath];
   [path moveToPoint:rect.origin];
   [path appendBezierPathWithArcFromPoint:bottomRight
                                 toPoint:topRight
                                   radius:radius];
   [path appendBezierPathWithArcFromPoint:topRight
                                 toPoint:topLeft
                                  radius:radius];
   [path lineToPoint:topLeft];
-  [path closePath];  // Right path is closed
   return path;
 }
 
-- (void)elideTitle:(int)availableWidth {
+- (NSString*)elideTitle:(int)availableWidth {
   NSFont* font = [self font];
   gfx::Font font_chr =
       gfx::Font::CreateFont(base::SysNSStringToWide([font fontName]),
                             [font pointSize]);
 
-  NSString* titleString = base::SysWideToNSString(
+  return base::SysWideToNSString(
       ElideFilename(downloadPath_, font_chr, availableWidth));
-  [self setTitle:titleString];
+}
+
+- (NSString*)elideStatus:(int)availableWidth {
+  NSFont* font = [self secondaryFont];
+  gfx::Font font_chr =
+      gfx::Font::CreateFont(base::SysNSStringToWide([font fontName]),
+                            [font pointSize]);
+
+  return base::SysWideToNSString(ElideText(
+      base::SysNSStringToWide([self secondaryTitle]),
+      font_chr,
+      availableWidth));
 }
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   // Constants from Cole.  Will kConstant them once the feedback loop
   // is complete.
   NSRect drawFrame = NSInsetRect(cellFrame, 1.5, 1.5);
   NSRect innerFrame = NSInsetRect(cellFrame, 2, 2);
 
   const float radius = 5;
   NSWindow* window = [controlView window];
@@ skipping 36 matching lines @@
             showHighlightGradient:[self isMouseOverDropdownPart]
                        hoverAlpha:0.0
                            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)];
+  CGFloat textWidth = cellFrame.size.width -
+      (kTextPosLeft + kTextPaddingRight + kDropdownAreaWidth);
+  [self setTitle:[self elideTitle:textWidth]];
+
+  NSColor* themeTextColor = [[[self controlView] gtm_theme]
+      textColorForStyle:GTMThemeStyleBookmarksBarButton
+                  state:GTMThemeStateActiveWindow];
 
   NSColor* color = [self isButtonPartPressed]
-      ? [NSColor alternateSelectedControlTextColor] : [NSColor textColor];
+      ? [NSColor alternateSelectedControlTextColor] : themeTextColor;
   NSString* primaryText = [self title];
 
   NSDictionary* primaryTextAttributes = [NSDictionary
       dictionaryWithObjectsAndKeys:
       color, NSForegroundColorAttributeName,
       [self font], NSFontAttributeName,
       nil];
   NSPoint primaryPos = NSMakePoint(
       cellFrame.origin.x + kTextPosLeft,
       titleY_);
 
   [primaryText drawAtPoint:primaryPos withAttributes:primaryTextAttributes];
 
   // Draw secondary title, if any
   if ([self secondaryTitle] != nil && statusAlpha_ > 0) {
-    NSString* secondaryText = [self secondaryTitle];
-    NSColor* secondaryColor = [color colorWithAlphaComponent:statusAlpha_];
+    NSString* secondaryText = [self elideStatus:textWidth];
+    NSColor* secondaryColor = [NSColor colorWithDeviceWhite:kSecondaryTextColor
+                                                      alpha:statusAlpha_];
     NSDictionary* secondaryTextAttributes = [NSDictionary
         dictionaryWithObjectsAndKeys:
         secondaryColor, NSForegroundColorAttributeName,
         [self secondaryFont], NSFontAttributeName,
         nil];
     NSPoint secondaryPos = NSMakePoint(
         cellFrame.origin.x + kTextPosLeft,
         kSecondaryTextPosTop);
     [secondaryText drawAtPoint:secondaryPos
         withAttributes:secondaryTextAttributes];
@@ skipping 34 matching lines @@
 
   // Draw icon
   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];
 
+  // Separator between button and popup parts
+  CGFloat lx = NSMaxX(cellFrame) - kDropdownAreaWidth + 0.5;
+  [[NSColor colorWithDeviceWhite:0.0 alpha:0.1] set];
+  [NSBezierPath strokeLineFromPoint:NSMakePoint(lx, NSMinY(cellFrame) + 1)
+                            toPoint:NSMakePoint(lx, NSMaxY(cellFrame) - 1)];
+  [[NSColor colorWithDeviceWhite:1.0 alpha:0.1] set];
+  [NSBezierPath strokeLineFromPoint:NSMakePoint(lx + 1, NSMinY(cellFrame) + 1)
+                            toPoint:NSMakePoint(lx + 1, NSMaxY(cellFrame) - 1)];
+
   // Popup arrow. Put center of mass of the arrow in the center of the
   // dropdown area.
   CGFloat cx = NSMaxX(cellFrame) - kDropdownAreaWidth/2 + 0.5;
   CGFloat cy = NSMidY(cellFrame);
   NSPoint p1 = NSMakePoint(cx - kDropdownArrowWidth/2,
-                           cy - kDropdownArrowHeight/3);
+                           cy - kDropdownArrowHeight/3 + kDropdownAreaY);
   NSPoint p2 = NSMakePoint(cx + kDropdownArrowWidth/2,
-                           cy - kDropdownArrowHeight/3);
-  NSPoint p3 = NSMakePoint(cx, cy + kDropdownArrowHeight*2/3);
+                           cy - kDropdownArrowHeight/3 + kDropdownAreaY);
+  NSPoint p3 = NSMakePoint(cx, cy + kDropdownArrowHeight*2/3 + kDropdownAreaY);
   NSBezierPath *triangle = [NSBezierPath bezierPath];
   [triangle moveToPoint:p1];
   [triangle lineToPoint:p2];
   [triangle lineToPoint:p3];
   [triangle closePath];
 
+  NSGraphicsContext* context = [NSGraphicsContext currentContext];
+  [context saveGraphicsState];
+
+  scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
+  [shadow setShadowColor:[NSColor whiteColor]];
+  [shadow setShadowOffset:NSMakeSize(0, -1)];
+  [shadow setShadowBlurRadius:0.0];
+  [shadow set];
+
   NSColor* fill = [self isDropdownPartPressed]
-      ? [NSColor alternateSelectedControlTextColor] : [NSColor textColor];
+      ? [NSColor alternateSelectedControlTextColor] : themeTextColor;
   [fill setFill];
+
   [triangle fill];
+
+  [context restoreGraphicsState];
 }
 
 - (NSRect)imageRectForBounds:(NSRect)cellFrame {
   return NSMakeRect(cellFrame.origin.x + kImagePaddingLeft,
                     cellFrame.origin.y + kImagePaddingTop,
                     kImageWidth,
                     kImageHeight);
 }
 
 - (void)hideSecondaryTitle {
@@ skipping 45 matching lines @@
   }
   return self;
 }
 
 - (void)setCurrentProgress:(NSAnimationProgress)progress {
   [super setCurrentProgress:progress];
   [cell_ animation:self progressed:progress];
 }
 
 @end