Mac: Omnibox popup metrics.

chrome/browser/autocomplete/autocomplete_popup_view_mac.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.
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 
 namespace {
 
+// The size delta between the font used for the edit and the result
+// rows.
+const int kEditFontAdjust = -1;
+
+// How much to adjust the cell sizing up from the default determined
+// by the font.
+const int kCellHeightAdjust = 7.0;
+
 // Background colors for different states of the popup elements.
 NSColor* BackgroundColor() {
   return [NSColor controlBackgroundColor];
 }
 NSColor* SelectedBackgroundColor() {
   return [NSColor selectedControlColor];
 }
 NSColor* HoveredBackgroundColor() {
   return [NSColor controlColor];
 }
@@ skipping 99 matching lines @@
 // Return the text to show for the match, based on the match's
 // contents and description.  Result will be in |font|, with the
 // boldfaced version used for matches.
 NSAttributedString* AutocompletePopupViewMac::MatchText(
     const AutocompleteMatch& match, NSFont* font) {
   NSMutableAttributedString *as =
       DecorateMatchedString(match.contents, match.contents_class,
                             ContentTextColor(), font);
 
   // If there is a description, append it, separated from the contents
-  // with an em dash, and decorated with a distinct color.
+  // with an en dash, and decorated with a distinct color.
   if (!match.description.empty()) {
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObjectsAndKeys:
              font, NSFontAttributeName,
              ContentTextColor(), NSForegroundColorAttributeName,
              nil];
-    NSString* rawEmDash = [NSString stringWithFormat:@" %C ", 0x2014];
-    NSAttributedString* emDash =
-        [[[NSAttributedString alloc] initWithString:rawEmDash
+    NSString* rawEnDash = [NSString stringWithFormat:@" %C ", 0x2013];
+    NSAttributedString* enDash =
+        [[[NSAttributedString alloc] initWithString:rawEnDash
                                          attributes:attributes] autorelease];
 
     NSAttributedString* description =
         DecorateMatchedString(match.description, match.description_class,
                               DescriptionTextColor(), font);
 
-    [as appendAttributedString:emDash];
+    [as appendAttributedString:enDash];
     [as appendAttributedString:description];
   }
 
   NSMutableParagraphStyle* style =
       [[[NSMutableParagraphStyle alloc] init] autorelease];
   [style setLineBreakMode:NSLineBreakByTruncatingTail];
   [as addAttribute:NSParagraphStyleAttributeName value:style
              range:NSMakeRange(0, [as length])];
 
   return as;
@@ skipping 93 matching lines @@
     NSMatrix* matrix = [popup_ contentView];
     [matrix setTarget:nil];
 
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
+  // The popup's font is a slightly smaller version of what |field_|
+  // uses.
+  NSFont* fieldFont = [field_ font];
+  const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
+  NSFont* resultFont =
+      [NSFont fontWithName:[fieldFont fontName] size:resultFontSize];
+
   // Load the results into the popup's matrix.
   AutocompleteMatrix* matrix = [popup_ contentView];
   const size_t rows = model_->result().size();
   DCHECK_GT(rows, 0U);
   [matrix renewRows:rows columns:1];
   for (size_t ii = 0; ii < rows; ++ii) {
     AutocompleteButtonCell* cell = [matrix cellAtRow:ii column:0];
     const AutocompleteMatch& match = model_->result().match_at(ii);
     [cell setImage:MatchIcon(match)];
-    [cell setAttributedTitle:MatchText(match, [field_ font])];
+    [cell setAttributedTitle:MatchText(match, resultFont)];
   }
 
   // Layout the popup and size it to land underneath the field.
   // TODO(shess) Consider refactoring to remove this depenency,
   // because the popup doesn't need any of the field-like aspects of
   // field_.  The edit view could expose helper methods for attaching
   // the window to the field.
 
   // Locate |field_| on the screen.
   NSRect r = [field_ convertRect:[field_ bounds] toView:nil];
   r.origin = [[field_ window] convertBaseToScreen:r.origin];
   DCHECK_GT(r.size.width, 0.0);
 
   // Set the cell size to fit a line of text in the cell's font.  All
   // cells should use the same font and each should layout in one
   // line, so they should all be about the same height.
   const NSSize cellSize = [[matrix cellAtRow:0 column:0] cellSize];
   DCHECK_GT(cellSize.height, 0.0);
-  [matrix setCellSize:NSMakeSize(r.size.width, cellSize.height)];
+  [matrix setCellSize:NSMakeSize(r.size.width,
+                                 cellSize.height + kCellHeightAdjust)];
 
   // Make the matrix big enough to hold all the cells.
   [matrix sizeToCells];
 
   // Make the window just as big.
   r.size.height = [matrix frame].size.height;
   r.origin.y -= r.size.height + 2;
 
   // Update the selection.
   PaintUpdatesNow();
@@ skipping 84 matching lines @@
 - (void)updateTrackingAreas {
   [self resetTrackingArea];
   [super updateTrackingAreas];
 }
 
 - initWithFrame:(NSRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
     [self setCellClass:[AutocompleteButtonCell class]];
 
-    [self setIntercellSpacing:NSMakeSize(1.0, 1.0)];
+    // Cells pack with no spacing.
+    [self setIntercellSpacing:NSMakeSize(0.0, 0.0)];
+
     [self setDrawsBackground:YES];
     [self setBackgroundColor:BackgroundColor()];
     [self renewRows:0 columns:1];
     [self setAllowsEmptySelection:YES];
     [self setMode:NSRadioModeMatrix];
     [self deselectAllCells];
 
     [self resetTrackingArea];
   }
   return self;
@@ skipping 41 matching lines @@
   }
   return self;
 }
 
 - (void)select:sender {
   DCHECK(popup_view_);
   popup_view_->AcceptInput();
 }
 
 @end