[Mac] Change the omnibox decoration padding

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

 // Copyright (c) 2012 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/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 13 matching lines @@
 
 using extensions::FeatureSwitch;
 
 namespace {
 
 // Matches the clipping radius of |GradientButtonCell|.
 const CGFloat kCornerRadius = 3.0;
 
 // How far to inset the left- and right-hand decorations from the field's
 // bounds.
-const CGFloat kRightDecorationXOffset = 5.0;
-const CGFloat kLeftDecorationXOffset = 6.0;
+const CGFloat kRightDecorationXOffset = 2.0;
+const CGFloat kLeftDecorationXOffset = 1.0;
 
-// The amount of padding on either side reserved for drawing
-// decorations.  [Views has |kItemPadding| == 3.]
-const CGFloat kDecorationHorizontalPad = 4.0;
+// How much the text frame needs to overlap the rightmost left decoration.
+const CGFloat kTextFrameDecorationOverlap = 4.0;
 
 // How long to wait for mouse-up on the location icon before assuming
 // that the user wants to drag.
 const NSTimeInterval kLocationIconDragTimeout = 0.25;
 
 // Calculate the positions for a set of decorations.  |frame| is the
 // overall frame to do layout in, |remaining_frame| will get the
 // left-over space.  |all_decorations| is the set of decorations to
 // lay out, |decorations| will be set to the decorations which are
 // visible and which fit, in the same order as |all_decorations|,
@@ skipping 12 matching lines @@
     NSRect* remaining_frame) {
   DCHECK(x_edge == NSMinXEdge || x_edge == NSMaxXEdge);
   DCHECK_EQ(decorations->size(), decoration_frames->size());
 
   // The initial padding depends on whether the first visible decoration is
   // a button or not.
   bool is_first_visible_decoration = true;
 
   for (size_t i = 0; i < all_decorations.size(); ++i) {
     if (all_decorations[i]->IsVisible()) {
-      CGFloat padding = kDecorationHorizontalPad;
+      CGFloat padding = 0;
       if (is_first_visible_decoration) {
         padding = regular_padding;
         is_first_visible_decoration = false;
       }
 
       NSRect padding_rect, available;
 
       // Peel off the outside padding.
       NSDivideRect(frame, &padding_rect, &available, padding, x_edge);
 
       // Find out how large the decoration will be in the remaining
       // space.
       const CGFloat used_width =
           all_decorations[i]->GetWidthForSpace(NSWidth(available));
 
       if (used_width != LocationBarDecoration::kOmittedWidth) {
         DCHECK_GT(used_width, 0.0);
         NSRect decoration_frame;
 
         // Peel off the desired width, leaving the remainder in
         // |frame|.
         NSDivideRect(available, &decoration_frame, &frame,
                      used_width, x_edge);
 
         decorations->push_back(all_decorations[i]);
         decoration_frames->push_back(decoration_frame);
         DCHECK_EQ(decorations->size(), decoration_frames->size());
-
-        // Adjust padding for between decorations.
-        padding = kDecorationHorizontalPad;
       }
     }
   }
 
   DCHECK_EQ(decorations->size(), decoration_frames->size());
   *remaining_frame = frame;
 }
 
 // Helper function for calculating placement of decorations w/in the cell.
 // |frame| is the cell's boundary rectangle, |remaining_frame| will get any
@@ skipping 16 matching lines @@
 
   // Layout |left_decorations| against the LHS.
   CalculatePositionsHelper(frame, left_decorations, NSMinXEdge,
                            kLeftDecorationXOffset, decorations,
                            decoration_frames, &frame);
   DCHECK_EQ(decorations->size(), decoration_frames->size());
 
   // Capture the number of visible left-hand decorations.
   const size_t left_count = decorations->size();
 
+  // Extend the text frame so that it slightly overlaps the rightmost left
+  // decoration.
+  if (left_count) {
+    frame.origin.x -= kTextFrameDecorationOverlap;
+    frame.size.width += kTextFrameDecorationOverlap;
+  }
+
   // Layout |right_decorations| against the RHS.
   CalculatePositionsHelper(frame, right_decorations, NSMaxXEdge,
                            kRightDecorationXOffset, decorations,
                            decoration_frames, &frame);
   DCHECK_EQ(decorations->size(), decoration_frames->size());
 
   // Reverse the right-hand decorations so that overall everything is
   // sorted left to right.
   std::reverse(decorations->begin() + left_count, decorations->end());
   std::reverse(decoration_frames->begin() + left_count,
@@ skipping 114 matching lines @@
       CalculatePositionsInFrame(cellFrame, leftDecorations_, rightDecorations_,
                                 &decorations, &decorationFrames, &textFrame);
 
   // Determine the left-most extent for the i-beam cursor.
   CGFloat minX = NSMinX(textFrame);
   for (size_t index = left_count; index--; ) {
     if (decorations[index]->AcceptsMousePress())
       break;
 
     // If at leftmost decoration, expand to edge of cell.
-    if (!index) {
+    if (!index)
       minX = NSMinX(cellFrame);
-    } else {
-      minX = NSMinX(decorationFrames[index]) - kDecorationHorizontalPad;
-    }
+    else
+      minX = NSMinX(decorationFrames[index]);
   }
 
   // Determine the right-most extent for the i-beam cursor.
   CGFloat maxX = NSMaxX(textFrame);
   for (size_t index = left_count; index < decorations.size(); ++index) {
     if (decorations[index]->AcceptsMousePress())
       break;
 
     // If at rightmost decoration, expand to edge of cell.
-    if (index == decorations.size() - 1) {
+    if (index == decorations.size() - 1)
       maxX = NSMaxX(cellFrame);
-    } else {
-      maxX = NSMaxX(decorationFrames[index]) + kDecorationHorizontalPad;
-    }
+    else
+      maxX = NSMaxX(decorationFrames[index]);
   }
 
   // I-beam cursor covers left-most to right-most.
   return NSMakeRect(minX, NSMinY(textFrame), maxX - minX, NSHeight(textFrame));
 }
 
 - (void)drawWithFrame:(NSRect)frame inView:(NSView*)controlView {
   BOOL inDarkMode = [[controlView window] inIncognitoModeWithSystemTheme];
   BOOL showingFirstResponder = [self showsFirstResponder];
   // Adjust the inset by 1/2 the line width to get a crisp line (screen pixels
@@ skipping 55 matching lines @@
   std::vector<LocationBarDecoration*> decorations;
   std::vector<NSRect> decorationFrames;
   NSRect workingFrame;
 
   CalculatePositionsInFrame(cellFrame, leftDecorations_, rightDecorations_,
                             &decorations, &decorationFrames, &workingFrame);
 
   // Draw the decorations.
   for (size_t i = 0; i < decorations.size(); ++i) {
     if (decorations[i]) {
-      NSRect background_frame = NSInsetRect(
-          decorationFrames[i], -(kDecorationHorizontalPad + 1) / 2, 2);
-      decorations[i]->DrawWithBackgroundInFrame(
-          background_frame, decorationFrames[i], controlView);
+      decorations[i]->DrawWithBackgroundInFrame(decorationFrames[i],
+                                                controlView);
     }
   }
 
   // NOTE: This function must closely match the logic in
   // |-textFrameForFrame:|.
 
   // Superclass draws text portion WRT original |cellFrame|.
   ui::ScopedCGContextSmoothFonts fontSmoothing;
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 }
@@ skipping 279 matching lines @@
 
 - (void)handleFocusEvent:(NSEvent*)event
                   ofView:(AutocompleteTextField*)controlView {
   if ([controlView observer]) {
     const bool controlDown = ([event modifierFlags] & NSControlKeyMask) != 0;
     [controlView observer]->OnSetFocus(controlDown);
   }
 }
 
 @end