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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.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/bookmarks/bookmark_bar_folder_controller.h"
 
 #include <stddef.h>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 314 matching lines @@
   //   [NSObject cancelPreviousPerformRequestsWithTarget:self];
   // Because all of our performSelector: calls use withDelay: which
   // retains us.
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   NSRect windowFrame = [[self window] frame];
   NSRect scrollViewFrame = [scrollView_ frame];
   padding_ = NSWidth(windowFrame) - NSWidth(scrollViewFrame);
+  // In Material Design, each menu row spans the entire width of the menu.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    scrollViewFrame.size.width += padding_;
+    scrollViewFrame.origin.x = 0;
+    // If we leave the scrollview's vertical position and height as is, it will
+    // cover the menu's rounded corners and we'll get a rectangular menu.
+    scrollViewFrame.origin.y += bookmarks::BookmarkVerticalPadding();
+    scrollViewFrame.size.height -= 2 * bookmarks::BookmarkVerticalPadding();
+    [scrollView_ setFrame:scrollViewFrame];
+    padding_ = 0;
+  }
   verticalScrollArrowHeight_ = NSHeight([scrollUpArrowView_ frame]);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   NSImage* image = rb.GetNativeImageNamed(IDR_MENU_OVERFLOW_DOWN).ToNSImage();
   [[scrollUpArrowView_.subviews objectAtIndex:0] setImage:image];
 
   image = rb.GetNativeImageNamed(IDR_MENU_OVERFLOW_UP).ToNSImage();
   [[scrollDownArrowView_.subviews objectAtIndex:0] setImage:image];
 }
 
@@ skipping 38 matching lines @@
                                             forADarkTheme:NO]
                          : nil;
   BookmarkContextMenuCocoaController* menuController =
       [barController_ menuController];
   BookmarkBarFolderButtonCell* cell =
       [BookmarkBarFolderButtonCell buttonCellForNode:child
                                                 text:nil
                                                image:image
                                       menuController:menuController];
   if (ui::MaterialDesignController::IsModeMaterial()) {
-    [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+    [cell setTag:kMaterialMenuButtonTypeWithLimitedClickFeedback];
   } else {
     [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
   }
   return cell;
 }
 
 // Redirect to our logic shared with BookmarkBarController.
 - (IBAction)openBookmarkFolderFromButton:(id)sender {
   [folderTarget_ openBookmarkFolderFromButton:sender];
 }
@@ skipping 31 matching lines @@
   // limited by the abolute minimum and maximum allowable widths.
   frame.size.width =
       std::min(std::max(bookmarks::kBookmarkMenuButtonMinimumWidth,
                         std::max(frame.size.width, desired)),
                bookmarks::kBookmarkMenuButtonMaximumWidth);
 
   BookmarkButton* button = [[[BookmarkButton alloc] initWithFrame:frame]
                                autorelease];
   DCHECK(button);
 
+  // Folder menu buttons have a flat background color in Material Design.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    [button setBackgroundColor:
+        [BookmarkBarFolderWindowContentView backgroundColor]];
+  }
   [button setCell:cell];
   [button setDelegate:self];
   if (node) {
     if (node->is_folder()) {
       [button setTarget:self];
       [button setAction:@selector(openBookmarkFolderFromButton:)];
     } else {
       // Make the button do something.
       [button setTarget:barController_];
       [button setAction:@selector(openBookmark:)];
@@ skipping 73 matching lines @@
     // popping up from the bookmark bar itself.  In this case, start
     // BELOW the parent button.  Our left is the button left; our top
     // is bottom of button's parent view.
     NSPoint buttonBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [parentButton_ convertPoint:NSZeroPoint toView:nil]);
     NSPoint bookmarkBarBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [[parentButton_ superview] convertPoint:NSZeroPoint toView:nil]);
     newWindowTopLeft = NSMakePoint(
-        buttonBottomLeftInScreen.x + bookmarks::kBookmarkBarButtonOffset,
+        buttonBottomLeftInScreen.x,
         bookmarkBarBottomLeftInScreen.y + bookmarks::kBookmarkBarMenuOffset);
+    if (!ui::MaterialDesignController::IsModeMaterial()) {
+      newWindowTopLeft.y += bookmarks::kBookmarkBarButtonOffset;
+    }
     // Make sure the window is on-screen; if not, push left or right. It is
     // intentional that top level folders "push left" or "push right" slightly
     // different than subfolders.
     NSRect screenVisibleFrame = [[self menuScreen] visibleFrame];
     // Test if window goes off-screen on the right side.
     CGFloat spillOff =
         newWindowTopLeft.x + windowWidth - NSMaxX(screenVisibleFrame);
     if (spillOff > 0.0) {
       newWindowTopLeft.x = std::max(newWindowTopLeft.x - spillOff,
                                     NSMinX(screenVisibleFrame));
@@ skipping 307 matching lines @@
     newWindowTopLeft.y = MAX(newWindowTopLeft.y, minimumY);
   }
 
   NSWindow* window = [self window];
   NSRect windowFrame = NSMakeRect(newWindowTopLeft.x,
                                   newWindowTopLeft.y - height,
                                   windowWidth, height);
   [window setFrame:windowFrame display:NO];
 
   NSRect folderFrame = NSMakeRect(0, 0, windowWidth, height);
+  // Each menu button is 24pt tall but its highlight is only 20pt - effectively
+  // each menu button includes 4pts of vertical padding. This wasn't a problem
+  // pre-Material, but now that the |scrollView_| is shorter we have an extra
+  // 4pt of padding pushing the topmost item beyond the top of the
+  // |scrollView_|. Scoot the |folderView_| down by this padding to avoid
+  // clipping the topmost item.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    folderFrame.origin.y -= bookmarks::BookmarkVerticalPadding();
+  }
   [folderView_ setFrame:folderFrame];
 
   // For some reason, when opening a "large" bookmark folder (containing 12 or
   // more items) using the keyboard, the scroll view seems to want to be
   // offset by default: [ http://crbug.com/101099 ].  Explicitly reseting the
   // scroll position here is a bit hacky, but it does seem to work.
   [[scrollView_ contentView] scrollToPoint:NSZeroPoint];
 
   NSSize newSize = NSMakeSize(windowWidth, 0.0);
   [self adjustWindowLeft:newWindowTopLeft.x size:newSize scrollingBy:0.0];
@@ skipping 1212 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController