[Mac][MD User Menu] UI Tweaks

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // Copyright 2014 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/profiles/profile_chooser_controller.h"
 
 #import <Carbon/Carbon.h>  // kVK_Return.
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 556 matching lines @@
   if ((self = [super initWithFrame:frameRect])) {
     avatarMenu_ = avatarMenu;
     controller_ = controller;
 
     [self setBordered:NO];
 
     base::scoped_nsobject<CustomCircleImageCell> cell(
         [[CustomCircleImageCell alloc] init]);
     [self setCell:cell.get()];
 
-    const int imageSide =
-        switches::IsMaterialDesignUserMenu() ? kMdImageSide : kLargeImageSide;
-    [self setDefaultImage:CreateProfileImage(profileIcon, imageSide,
-                                             profiles::SHAPE_CIRCLE)];
+    [self setDefaultImage:CreateProfileImage(profileIcon, kLargeImageSide,
+                                             profiles::SHAPE_SQUARE)];
     [self setImagePosition:NSImageOnly];
 
     if (editingAllowed) {
-      NSRect bounds = NSMakeRect(0, 0, imageSide, imageSide);
+      NSRect bounds = NSMakeRect(0, 0, kLargeImageSide, kLargeImageSide);
       [self setTarget:self];
       [self setAction:@selector(editPhoto:)];
       changePhotoImage_.reset([[TransparentBackgroundImageView alloc]
           initWithFrame:bounds]);
       [changePhotoImage_ setImage:ui::ResourceBundle::GetSharedInstance().
           GetNativeImageNamed(IDR_ICON_PROFILES_EDIT_CAMERA).AsNSImage()];
       [self addSubview:changePhotoImage_];
 
       // Hide the image until the button is hovered over.
       [changePhotoImage_ setHidden:YES];
@@ skipping 239 matching lines @@
 
     [self setBordered:NO];
     [self setFont:[NSFont labelFontOfSize:kTextFontSize]];
     [self setButtonType:NSMomentaryChangeButton];
 
     base::scoped_nsobject<CustomPaddingImageButtonCell> cell(
         [[CustomPaddingImageButtonCell alloc]
             initWithLeftMarginSpacing:kHorizontalSpacing
                     imageTitleSpacing:imageTitleSpacing]);
     [cell setLineBreakMode:NSLineBreakByTruncatingTail];
+    if (switches::IsMaterialDesignUserMenu())
+      [cell setHighlightsBy:NSNoCellMask];
     [self setCell:cell.get()];
   }
   return self;
 }
 
 - (void)setRightMarginSpacing:(int)rightMarginSpacing {
   [[self cell] setRightMarginSpacing:rightMarginSpacing];
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   if ([self isEnabled]) {
     bool isHighlighted = ([self hoverState] != kHoverStateNone);
     NSColor* backgroundColor = isHighlighted ? hoverColor_ : backgroundColor_;
     [[self cell] setBackgroundColor:backgroundColor];
   }
   [super drawRect:dirtyRect];
 }
 
 -(void)keyDown:(NSEvent*)event {
   // Since there is no default button in the bubble, it is safe to activate
   // all buttons on Enter as well, and be consistent with the Windows
   // implementation.
   if ([event keyCode] == kVK_Return)
     [self performClick:self];
   else
     [super keyDown:event];
 }
 
 - (BOOL)canBecomeKeyView {
-  return YES;
+  return [self isEnabled] ? YES : NO;
 }
 
 @end
 
 // A custom view with the given background color.
 @interface BackgroundColorView : NSView {
  @private
   base::scoped_nsobject<NSColor> backgroundColor_;
 }
 @end
@@ skipping 1160 matching lines @@
   if (!NSIsEmptyRect(profileLinksBound)) {
     NSView* linksContainer =
         [self createCurrentProfileLinksForItem:item rect:profileLinksBound];
     [container addSubview:linksContainer];
     yOffset = NSMaxY([linksContainer frame]);
   }
 
   // Profile card button that contains the profile icon, name, and username.
   NSRect rect = NSMakeRect(0, yOffset, GetFixedMenuWidth(),
                            kMdImageSide + kVerticalSpacing);
-  NSButton* profileCard = [self hoverButtonWithRect:rect
-                                               text:[[NSString alloc] init]
-                                             action:@selector(editProfile:)];
+  NSButton* profileCard =
+      [self hoverButtonWithRect:rect
+                           text:[[NSString alloc] init]
+                          image:CreateProfileImage(item.icon, kMdImageSide,
+                                                   profiles::SHAPE_CIRCLE)
+                         action:@selector(editProfile:)];
+  [[profileCard cell] setImageDimsWhenDisabled:NO];
   [container addSubview:profileCard];
   if (isGuestSession_)
     [profileCard setEnabled:NO];
 
-  // Profile icon, left-aligned.
-  base::scoped_nsobject<NSImageView> iconView([[NSImageView alloc]
-      initWithFrame:NSMakeRect(xOffset, cardYOffset, kMdImageSide,
-                               kMdImageSide)]);
-  [iconView setImage:CreateProfileImage(item.icon, kMdImageSide,
-                                        profiles::SHAPE_CIRCLE)];
-  [profileCard addSubview:iconView];
+  // Profile badge for supervised account.
+  if (browser_->profile()->IsSupervised()) {
+    base::scoped_nsobject<NSImageView> supervisedIcon(
+        [[NSImageView alloc] initWithFrame:NSZeroRect]);
+    // TODO(janeliulwq): Replace the following two profile badge icons with
+    // smaller versions of them (24 x 24) to adapt to smaller profile icons.
+    int imageId = browser_->profile()->IsChild()
+                      ? IDR_ICON_PROFILES_MENU_CHILD
+                      : IDR_ICON_PROFILES_MENU_LEGACY_SUPERVISED;
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    [supervisedIcon setImage:rb.GetNativeImageNamed(imageId).ToNSImage()];
+
+    NSSize size = [[supervisedIcon image] size];
+    [supervisedIcon setFrameSize:size];
+    const int badgeSpacing = 4;
+    [supervisedIcon setFrameOrigin:NSMakePoint(xOffset + kMdImageSide -
+                                                   size.width + badgeSpacing,
+                                               cardYOffset + kMdImageSide -
+                                                   size.height + badgeSpacing)];
+    [profileCard addSubview:supervisedIcon];
+  }
 
   // Profile name, left-aligned to the right of profile icon.
   xOffset += kMdImageSide + kHorizontalSpacing;
   CGFloat fontSize = kTextFontSize + 1.0;
   NSTextField* profileName = BuildLabel(
       base::SysUTF16ToNSString(
           profiles::GetAvatarNameForProfile(browser_->profile()->GetPath())),
       NSZeroPoint, nil);
   [[profileName cell] setLineBreakMode:NSLineBreakByTruncatingTail];
   [profileName setFont:[NSFont labelFontOfSize:fontSize]];
+  [profileName sizeToFit];
+  const int profileNameYOffset =
+      cardYOffset +
+      std::floor((kMdImageSide - NSHeight([profileName frame])) / 2);
   [profileName
-      setFrame:NSMakeRect(
-                   xOffset,
-                   cardYOffset +
-                       (kMdImageSide - [profileName frame].size.height) / 2,
-                   availableTextWidth, [profileName frame].size.height)];
+      setFrame:NSMakeRect(xOffset, profileNameYOffset, availableTextWidth,
+                          NSHeight([profileName frame]))];
   [profileCard addSubview:profileName];
 
   // Username, left-aligned to the right of profile icon and below the profile
   // name.
   if (item.signed_in && !switches::IsEnableAccountConsistency()) {
     // Adjust the y-position of profile name to leave space for username.
     cardYOffset += kMdImageSide / 2 - [profileName frame].size.height;
     [profileName setFrameOrigin:NSMakePoint(xOffset, cardYOffset)];
 
     NSTextField* username = BuildLabel(
         ElideEmail(base::UTF16ToUTF8(item.username), availableTextWidth),
         NSZeroPoint, skia::SkColorToSRGBNSColor(SK_ColorGRAY));
     [username setFrameOrigin:NSMakePoint(xOffset, NSMaxY([profileName frame]))];
     [profileCard addSubview:username];
   }
 
-  // Profile badge for supervised account.
-  if (browser_->profile()->IsSupervised()) {
-    base::scoped_nsobject<NSImageView> supervisedIcon(
-        [[NSImageView alloc] initWithFrame:NSZeroRect]);
-    // TODO(janeliulwq): Replace the following two profile badge icons with
-    // smaller versions of them (24 x 24) to adapt to smaller profile icons.
-    int imageId = browser_->profile()->IsChild()
-                      ? IDR_ICON_PROFILES_MENU_CHILD
-                      : IDR_ICON_PROFILES_MENU_LEGACY_SUPERVISED;
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    [supervisedIcon setImage:rb.GetNativeImageNamed(imageId).ToNSImage()];
-
-    NSSize size = [[supervisedIcon image] size];
-    [supervisedIcon setFrameSize:size];
-    NSRect profileIconFrame = [iconView frame];
-    const int badgeSpacing = 4;
-    [supervisedIcon setFrameOrigin:NSMakePoint(NSMaxX(profileIconFrame) -
-                                                   size.width + badgeSpacing,
-                                               NSMaxY(profileIconFrame) -
-                                                   size.height + badgeSpacing)];
-    [profileCard addSubview:supervisedIcon];
-  }
-
   yOffset = NSMaxY([profileCard frame]);
   [container setFrameSize:NSMakeSize(GetFixedMenuWidth(), yOffset)];
   return container.autorelease();
 }
 
 - (NSView*)createCurrentProfileLinksForItem:(const AvatarMenu::Item&)item
                                        rect:(NSRect)rect {
   if (switches::IsMaterialDesignUserMenu()) {
     // The branch is empty for material design user menu in non-account-
     // consistency mode, because in that case, the username would appear in the
@@ skipping 760 matching lines @@
 }
 
 - (bool)shouldShowGoIncognito {
   bool incognitoAvailable =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognitoAvailable && !browser_->profile()->IsGuestSession();
 }
 
 @end