[Mac][Material Design] Adjust bookmark spacing and folder menu drawing.

chrome/browser/ui/cocoa/gradient_button_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.
 
 #include "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
@@ skipping 190 matching lines @@
 
 #if 1
 // If we are not continuously pulsing, perform a pulse animation to
 // reflect our new state.
 - (void)setMouseInside:(BOOL)flag animate:(BOOL)animated {
   isMouseInside_ = flag;
   if (pulseState_ != gradient_button_cell::kPulsingContinuous) {
     if (animated) {
       // In Material Design, if the button is already fully on, don't pulse it
       // on again if the mouse is within its bounds.
-      if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
+      if ([self tag] == [self isMaterialDesignButtonType] &&
           isMouseInside_ && pulseState_ == gradient_button_cell::kPulsedOn) {
         return;
       }
 
       [self setPulseState:(isMouseInside_ ? gradient_button_cell::kPulsingOn :
                            gradient_button_cell::kPulsingOff)];
     } else {
       [self setPulseState:(isMouseInside_ ? gradient_button_cell::kPulsedOn :
                            gradient_button_cell::kPulsedOff)];
     }
@@ skipping 98 matching lines @@
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [self setMouseInside:NO animate:YES];
 }
 
 - (BOOL)isMouseInside {
   return trackingArea_ && isMouseInside_;
 }
 
 - (BOOL)startTrackingAt:(NSPoint)startPoint inView:(NSView *)controlView {
-  if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback) {
+  if ([self isMaterialDesignButtonType]) {
     // The user has just clicked down in the button. In Material Design, set the
     // pulsed (hover) state to off now so that if the user keeps the mouse held
     // down while dragging it out of the button's bounds, the button will draw
     // itself in its normal state. This is unrelated to dragging the button
     // in the button bar, which takes a different path through the code.
     [self setPulseState:gradient_button_cell::kPulsedOff];
   }
 
   return [super startTrackingAt:startPoint inView:controlView];
 }
@@ skipping 22 matching lines @@
                       controlView:(NSView*)controlView
                         innerPath:(NSBezierPath*)innerPath
               showClickedGradient:(BOOL)showClickedGradient
             showHighlightGradient:(BOOL)showHighlightGradient
                        hoverAlpha:(CGFloat)hoverAlpha
                            active:(BOOL)active
                         cellFrame:(NSRect)cellFrame
                   defaultGradient:(NSGradient*)defaultGradient {
   // For Material Design, draw a solid rounded rect behind the button, based on
   // the hover and pressed states.
-  if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback) {
+  if ([self isMaterialDesignButtonType]) {
     const CGFloat kEightPercentAlpha = 0.08;
     const CGFloat kFourPercentAlpha = 0.04;
 
     // The alpha is always at least 8%. Default the color to black.
     CGFloat alpha = kEightPercentAlpha;
     CGFloat color = 0.0;
 
     // If a dark theme, increase the opacity slightly and use white.
     if ([[controlView window] hasDarkTheme]) {
       alpha += kFourPercentAlpha;
@@ skipping 126 matching lines @@
                        inView:(NSView*)controlView
                    innerFrame:(NSRect*)returnInnerFrame
                     innerPath:(NSBezierPath**)returnInnerPath
                      clipPath:(NSBezierPath**)returnClipPath {
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   const CGFloat kHalfLineWidth = kLineWidth / 2.0;
 
   NSRect drawFrame = NSZeroRect;
   NSRect innerFrame = NSZeroRect;
   CGFloat cornerRadius = 2;
-  if ([self tag] != kMaterialStandardButtonTypeWithLimitedClickFeedback) {
+  if (![self isMaterialDesignButtonType]) {
     drawFrame = NSInsetRect(cellFrame, 1.5 * kLineWidth, 1.5 * kLineWidth);
     innerFrame = NSInsetRect(cellFrame, kLineWidth, kLineWidth);
     cornerRadius = 3;
   } else {
     drawFrame = cellFrame;
     // Hover and click paths are always 20pt tall, regardless of the button's
     // height.
     drawFrame.size.height = 20;
     innerFrame = NSInsetRect(drawFrame, kLineWidth, kLineWidth);
   }
@@ skipping 19 matching lines @@
     innerFrame.size.width -= 1.0;
 
   // Return results if |return...| not null.
   if (returnInnerFrame)
     *returnInnerFrame = innerFrame;
   if (returnInnerPath) {
     DCHECK(*returnInnerPath == nil);
     drawFrame.origin.y +=
         [self hoverBackgroundVerticalOffsetInControlView:controlView];
 
-    *returnInnerPath = [NSBezierPath bezierPathWithRoundedRect:drawFrame
-                                                       xRadius:cornerRadius
-                                                       yRadius:cornerRadius];
+    if ([self tag] == kMaterialMenuButtonTypeWithLimitedClickFeedback) {
+      *returnInnerPath = [NSBezierPath bezierPathWithRect:drawFrame];
+    } else {
+      *returnInnerPath = [NSBezierPath bezierPathWithRoundedRect:drawFrame
+                                                         xRadius:cornerRadius
+                                                         yRadius:cornerRadius];
+    }
     [*returnInnerPath setLineWidth:kLineWidth];
   }
   if (returnClipPath) {
     DCHECK(*returnClipPath == nil);
     NSRect clipPathRect =
         NSInsetRect(drawFrame, -kHalfLineWidth, -kHalfLineWidth);
     *returnClipPath = [NSBezierPath
         bezierPathWithRoundedRect:clipPathRect
                           xRadius:cornerRadius + kHalfLineWidth
                           yRadius:cornerRadius + kHalfLineWidth];
@@ skipping 15 matching lines @@
   NSWindow* window = [controlView window];
   const ui::ThemeProvider* themeProvider = [window themeProvider];
   BOOL active = [window isKeyWindow] || [window isMainWindow];
 
   // 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 or if
   // we're drawing the focus ring manually. In Material Design, the "border" is
   // actually a highlight, which should be drawn if
   // |showsBorderOnlyWhileMouseInside| is true.
   BOOL hasMaterialHighlight =
-      [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
+      [self isMaterialDesignButtonType] &&
       ![self showsBorderOnlyWhileMouseInside] &&
       enabled;
   if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
       pressed || [self isMouseInside] || [self isContinuousPulsing] ||
       hasMaterialHighlight) {
     // When pulsing we want the bookmark to stand out a little more.
     BOOL showClickedGradient = pressed ||
         (pulseState_ == gradient_button_cell::kPulsingContinuous);
     BOOL showHighlightGradient = [self isHighlighted] || hasMaterialHighlight;
 
@@ skipping 93 matching lines @@
 }
 
 - (int)verticalTextOffset {
   return 1;
 }
 
 - (CGFloat)hoverBackgroundVerticalOffsetInControlView:(NSView*)controlView {
   return 0.0;
 }
 
+- (BOOL)isMaterialDesignButtonType {
+  return [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback ||
+         [self tag] == kMaterialMenuButtonTypeWithLimitedClickFeedback;
+}
+
 // Overriden from NSButtonCell so we can display a nice fadeout effect for
 // button titles that overflow.
 // This method is copied in the most part from GTMFadeTruncatingTextFieldCell,
 // the only difference is that here we draw the text ourselves rather than
 // calling the super to do the work.
 // We can't use GTMFadeTruncatingTextFieldCell because there's no easy way to
 // get it to work with NSButtonCell.
 // TODO(jeremy): Move this to GTM.
 - (NSRect)drawTitle:(NSAttributedString*)title
           withFrame:(NSRect)cellFrame
              inView:(NSView*)controlView {
   NSSize size = [title size];
 
   // Empirically, Cocoa will draw an extra 2 pixels past NSWidth(cellFrame)
   // before it clips the text.
   const CGFloat kOverflowBeforeClip = 2;
-  BOOL isModeMaterial =
-      [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback;
+  BOOL isModeMaterial = [self isMaterialDesignButtonType];
   // For Material Design we don't want to clip the text. For all other button
   // cell modes, we do.
   BOOL shouldClipTheTitle = !isModeMaterial;
   if (std::floor(size.width) <= (NSWidth(cellFrame) + kOverflowBeforeClip)) {
     cellFrame.origin.y += ([self verticalTextOffset] - 1);
     shouldClipTheTitle = NO;
   }
 
   // Gradient is about twice our line height long.
   CGFloat gradientWidth = MIN(size.height * 2, NSWidth(cellFrame) / 4);
@@ skipping 111 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end