[Material][Mac] Adjustments to the Omnibox decorations

chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm

 // Copyright (c) 2010 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 <cmath>
 
 #import "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/material_design/material_design_controller.h"
 
 namespace {
 
 // This is used to increase the right margin of this decoration.
 const CGFloat kRightSideMargin = 1.0;
 
 // Padding between the icon/label and bubble edges.
 CGFloat BubblePadding() {
   return ui::MaterialDesignController::IsModeMaterial() ? 8.0 : 3.0;
 }
 
 // Additional padding between the divider between the omnibox text and the
 // divider. The desired value is 8px. We get 3px by subtracting the existing
 // padding in location_bar_view from 8px.
 CGFloat DividerPadding() {
-  return ui::MaterialDesignController::IsModeMaterial() ? 3.0 : 0.0;
+  return ui::MaterialDesignController::IsModeMaterial() ? 2.0 : 0.0;
 }
 
 // Padding between the icon and label.
-const CGFloat kIconLabelPadding = 4.0;
+CGFloat IconLabelPadding() {
+  return ui::MaterialDesignController::IsModeMaterial() ? 3.0 : 4.0;

[shrike, 2016/05/24 01:13:26]

Actually, the 4pt of padding was fine. It's just that the lock icon needs to
move 1pt to the left. With your change the text got closer to the lock, which is
not what we want.

After you move the lock icon 1pt to the left you'll probably have to increase
the IconLabelPadding to 5 instead of 4.

Also, please do move the lock icon up one 1pt. It definitely is sitting lower
than the text baseline.

[spqchan, 2016/05/24 21:05:24]

I made the pixel pushes with the new icon. Let me know if anything looks off.
I pushed the lock icon up 1 pt too, but I think it's off with the new icon

+}
 
 // Inset for the background.
 const CGFloat kBackgroundYInset = 4.0;
 
 }  // namespace
 
 BubbleDecoration::BubbleDecoration() : baseline_offset_(0) {
   attributes_.reset([[NSMutableDictionary alloc] init]);
   [attributes_ setObject:LocationBarDecoration::GetFont()
                   forKey:NSFontAttributeName];
 }
 
 BubbleDecoration::~BubbleDecoration() {
 }
 
 CGFloat BubbleDecoration::GetWidthForImageAndLabel(NSImage* image,
                                                    NSString* label) {
   if (!image && !label)
     return kOmittedWidth;
 
   const CGFloat image_width = image ? [image size].width : 0.0;
   if (!label)
     return BubblePadding() + image_width;
 
   // The bubble needs to take up an integral number of pixels.
   // Generally -sizeWithAttributes: seems to overestimate rather than
   // underestimate, so floor() seems to work better.
   const CGFloat label_width =
       std::floor([label sizeWithAttributes:attributes_].width);
-  return BubblePadding() + image_width + kIconLabelPadding + label_width +
+  return BubblePadding() + image_width + IconLabelPadding() + label_width +
          DividerPadding();
 }
 
 NSRect BubbleDecoration::GetImageRectInFrame(NSRect frame) {
   NSRect imageRect = NSInsetRect(frame, 0.0, kBackgroundYInset);
   if (image_) {
     // Center the image vertically.
     const NSSize imageSize = [image_ size];
     imageRect.origin.y +=
         std::floor((NSHeight(frame) - imageSize.height) / 2.0);
@@ skipping 23 matching lines @@
     NSRect imageRect = decoration_frame;
     imageRect.origin.y +=
         std::floor((NSHeight(decoration_frame) - imageSize.height) / 2.0);
     imageRect.size = imageSize;
     [image_ drawInRect:imageRect
               fromRect:NSZeroRect  // Entire image
              operation:NSCompositeSourceOver
               fraction:1.0
         respectFlipped:YES
                  hints:nil];
-    textOffset = NSMaxX(imageRect) + kIconLabelPadding;
+    textOffset = NSMaxX(imageRect) + IconLabelPadding();
   }
 
   // Draw the divider and set the text color.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     NSBezierPath* line = [NSBezierPath bezierPath];
     [line setLineWidth:1];
     [line moveToPoint:NSMakePoint(NSMaxX(decoration_frame) - DividerPadding(),
                                   NSMinY(decoration_frame))];
     [line lineToPoint:NSMakePoint(NSMaxX(decoration_frame) - DividerPadding(),
                                   NSMaxY(decoration_frame))];
@@ skipping 55 matching lines @@
   [attributes_ setObject:text_color forKey:NSForegroundColorAttributeName];
 }
 
 void BubbleDecoration::SetFont(NSFont* font) {
   [attributes_ setObject:font forKey:NSFontAttributeName];
 }
 
 void BubbleDecoration::SetBaselineOffset(CGFloat offset) {
   baseline_offset_ = offset;
 }