[Mac] Mirror profile switcher UI in RTL

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 138 matching lines @@
 
 // Builds a label with the given |title| anchored at |frame_origin|. Sets the
 // text color to |text_color| if not null.
 NSTextField* BuildLabel(NSString* title,
                         NSPoint frame_origin,
                         NSColor* text_color) {
   base::scoped_nsobject<NSTextField> label(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   [label setStringValue:title];
   [label setEditable:NO];
-  [label setAlignment:NSLeftTextAlignment];
+  [label setAlignment:NSNaturalTextAlignment];
   [label setBezeled:NO];
   [label setFont:[NSFont labelFontOfSize:kTextFontSize]];
   [label setDrawsBackground:NO];
   [label setFrameOrigin:frame_origin];
   [label sizeToFit];
 
   if (text_color)
     [[label cell] setTextColor:text_color];
 
   return label.autorelease();
@@ skipping 242 matching lines @@
   // The observer can be removed both when closing the browser, and by just
   // closing the avatar bubble. However, in the case of closing the browser,
   // the avatar bubble will also be closed afterwards, resulting in a second
   // attempt to remove the observer. This ensures the observer is only
   // removed once.
   bool token_observer_registered_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveProfileObserverBridge);
 };
 
-// Custom button cell that adds a left padding before the button image, and
+// Custom button cell that adds a leading padding before the button image, and
 // a custom spacing between the button image and title.
 @interface CustomPaddingImageButtonCell : NSButtonCell {
  @private
-  // Padding added to the left margin of the button.
-  int leftMarginSpacing_;
+  // Padding added to the leading margin of the button.
+  int leadingMarginSpacing_;
   // Spacing between the cell image and title.
   int imageTitleSpacing_;
-  // Padding added to the right margin of the button.
-  int rightMarginSpacing_;
+  // Padding added to the traling margin of the button.
+  int trailingMarginSpacing_;
 }
 
-- (id)initWithLeftMarginSpacing:(int)leftMarginSpacing
-              imageTitleSpacing:(int)imageTitleSpacing;
+- (id)initWithLeadingMarginSpacing:(int)leadingMarginSpacing
+                 imageTitleSpacing:(int)imageTitleSpacing;
 
-- (void)setRightMarginSpacing:(int)rightMarginSpacing;
+- (void)setTrailingMarginSpacing:(int)trailingMarginSpacing;
 @end
 
 @implementation CustomPaddingImageButtonCell
-- (id)initWithLeftMarginSpacing:(int)leftMarginSpacing
-              imageTitleSpacing:(int)imageTitleSpacing {
+- (id)initWithLeadingMarginSpacing:(int)leadingMarginSpacing
+                 imageTitleSpacing:(int)imageTitleSpacing {
   if ((self = [super init])) {
-    leftMarginSpacing_ = leftMarginSpacing;
+    leadingMarginSpacing_ = leadingMarginSpacing;
     imageTitleSpacing_ = imageTitleSpacing;
   }
   return self;
 }
 
-- (void)setRightMarginSpacing:(int)rightMarginSpacing {
-  rightMarginSpacing_ = rightMarginSpacing;
+- (void)setTrailingMarginSpacing:(int)trailingMarginSpacing {
+  trailingMarginSpacing_ = trailingMarginSpacing;
 }
 
 - (NSRect)drawTitle:(NSAttributedString*)title
           withFrame:(NSRect)frame
              inView:(NSView*)controlView {
   NSRect marginRect;
-  NSDivideRect(frame, &marginRect, &frame, leftMarginSpacing_, NSMinXEdge);
-
-  // The title frame origin isn't aware of the left margin spacing added
+  NSDivideRect(frame, &marginRect, &frame, leadingMarginSpacing_,
+               cocoa_l10n_util::LeadingEdge());
+  // The title frame origin isn't aware of the leading margin spacing added
   // in -drawImage, so it must be added when drawing the title as well.
-  if ([self imagePosition] == NSImageLeft)
-    NSDivideRect(frame, &marginRect, &frame, imageTitleSpacing_, NSMinXEdge);
-
-  NSDivideRect(frame, &marginRect, &frame, rightMarginSpacing_, NSMaxXEdge);
+  NSDivideRect(frame, &marginRect, &frame, imageTitleSpacing_,
+               cocoa_l10n_util::LeadingEdge());
+  NSDivideRect(frame, &marginRect, &frame, trailingMarginSpacing_,
+               cocoa_l10n_util::TrailingEdge());
 
   return [super drawTitle:title withFrame:frame inView:controlView];
 }
 
 - (void)drawImage:(NSImage*)image
         withFrame:(NSRect)frame
            inView:(NSView*)controlView {
-  if ([self imagePosition] == NSImageLeft)
-    frame.origin.x = leftMarginSpacing_;
+  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
+    frame.origin.x -= leadingMarginSpacing_;
+  else
+    frame.origin.x = leadingMarginSpacing_;
   [super drawImage:image withFrame:frame inView:controlView];
 }
 
 - (NSSize)cellSize {
   NSSize buttonSize = [super cellSize];
-  buttonSize.width += leftMarginSpacing_;
-  if ([self imagePosition] == NSImageLeft)
-    buttonSize.width += imageTitleSpacing_;
+  buttonSize.width += leadingMarginSpacing_;
+  buttonSize.width += imageTitleSpacing_;
   return buttonSize;
 }
 
 - (NSFocusRingType)focusRingType {
   // This is taken care of by the custom drawing code.
   return NSFocusRingTypeNone;
 }
 
 - (void)drawWithFrame:(NSRect)frame inView:(NSView *)controlView {
   [super drawInteriorWithFrame:frame inView:controlView];
@@ skipping 62 matching lines @@
 }
 @end
 
 // A custom button that allows for setting a background color when hovered over.
 @interface BackgroundColorHoverButton : HoverImageButton {
  @private
   base::scoped_nsobject<NSColor> backgroundColor_;
   base::scoped_nsobject<NSColor> hoverColor_;
 }
 
-- (void)setRightMarginSpacing:(int)rightMarginSpacing;
+- (void)setTrailingMarginSpacing:(int)trailingMarginSpacing;
 @end
 
 @implementation BackgroundColorHoverButton
 
 - (id)initWithFrame:(NSRect)frameRect
   imageTitleSpacing:(int)imageTitleSpacing
     backgroundColor:(NSColor*)backgroundColor {
   if ((self = [super initWithFrame:frameRect])) {
     backgroundColor_.reset([backgroundColor retain]);
     hoverColor_.reset([skia::SkColorToSRGBNSColor(profiles::kHoverColor)
                           retain]);
 
     [self setBordered:NO];
     [self setFont:[NSFont labelFontOfSize:kTextFontSize]];
     [self setButtonType:NSMomentaryChangeButton];
 
     base::scoped_nsobject<CustomPaddingImageButtonCell> cell(
         [[CustomPaddingImageButtonCell alloc]
-            initWithLeftMarginSpacing:kHorizontalSpacing
-                    imageTitleSpacing:imageTitleSpacing]);
+            initWithLeadingMarginSpacing:kHorizontalSpacing
+                       imageTitleSpacing:imageTitleSpacing]);
     [cell setLineBreakMode:NSLineBreakByTruncatingTail];
     [cell setHighlightsBy:NSNoCellMask];
     [self setCell:cell.get()];
   }
   return self;
 }
 
-- (void)setRightMarginSpacing:(int)rightMarginSpacing {
-  [[self cell] setRightMarginSpacing:rightMarginSpacing];
+- (void)setTrailingMarginSpacing:(int)trailingMarginSpacing {
+  [[self cell] setTrailingMarginSpacing:trailingMarginSpacing];
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   if ([self isEnabled]) {
     bool isHighlighted = ([self hoverState] != kHoverStateNone);
     NSColor* backgroundColor = isHighlighted ? hoverColor_ : backgroundColor_;
     [[self cell] setBackgroundColor:backgroundColor];
   }
   [super drawRect:dirtyRect];
 }
@@ skipping 974 matching lines @@
 
   [container
       setFrameSize:NSMakeSize(kFixedMenuWidth, yOffset + kVerticalSpacing)];
   return container.autorelease();
 }
 
 - (NSView*)createCurrentProfileView:(const AvatarMenu::Item&)item {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
 
+  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   CGFloat xOffset = kHorizontalSpacing;
   CGFloat yOffset = 0.0;
   CGFloat cardYOffset = kRelatedControllVerticalSpacing;
   CGFloat availableTextWidth =
       kFixedMenuWidth - 3.0 * kHorizontalSpacing - kMdImageSide;
   CGFloat maxAvailableTextWidth = kFixedMenuWidth - kHorizontalSpacing;
 
   // Profile options. This can be a link to the accounts view, or a "Sign in"
   // button for local profiles.
   SigninManagerBase* signinManager = SigninManagerFactory::GetForProfile(
@@ skipping 44 matching lines @@
 
   // Profile badge for supervised account.
   if (browser_->profile()->IsSupervised()) {
     // Draw a circle as the background of the badge icon.
     constexpr int badgeSize = 24;
     constexpr int badgeSpacing = 4;
     NSRect badgeIconCircleFrame =
         NSMakeRect(xOffset + kMdImageSide - badgeSize + badgeSpacing,
                    cardYOffset + kMdImageSide - badgeSize + badgeSpacing,
                    badgeSize, badgeSize);
+    if (isRTL)

[Elly Fong-Jones, 2017/05/24 18:55:27]

multi-line if bodies need {}

[lgrey, 2017/05/24 19:41:10]

Done.

+      badgeIconCircleFrame.origin.x = NSWidth([profileCard frame]) -
+                                      NSWidth(badgeIconCircleFrame) -
+                                      NSMinX(badgeIconCircleFrame);
     base::scoped_nsobject<BackgroundCircleView> badgeIconWithCircle([
         [BackgroundCircleView alloc] initWithFrame:badgeIconCircleFrame
                                      withFillColor:GetDialogBackgroundColor()]);
     // Add the badge icon.
     constexpr int borderWidth = 1;
     const int badgeIconSize = badgeSize - borderWidth * 2;
     base::scoped_nsobject<NSImageView> badgeIconView([[NSImageView alloc]
         initWithFrame:NSMakeRect(borderWidth, borderWidth,
                                  badgeIconSize, badgeIconSize)]);
     const gfx::VectorIcon& badgeIcon = browser_->profile()->IsChild()
                                            ? kAccountChildCircleIcon
                                            : kSupervisorAccountCircleIcon;
     [badgeIconView
         setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
                      badgeIcon, badgeIconSize, gfx::kChromeIconGrey))];
     [badgeIconWithCircle addSubview:badgeIconView];
 
     [profileCard addSubview:badgeIconWithCircle];
   }
-
-  // Profile name, left-aligned to the right of profile icon.
-  xOffset += kMdImageSide + kHorizontalSpacing;
+  if (!isRTL)
+    xOffset += kMdImageSide + kHorizontalSpacing;
   CGFloat fontSize = kTextFontSize + 1.0;
   NSString* profileNameNSString = base::SysUTF16ToNSString(profileNameString);
   NSTextField* profileName = BuildLabel(profileNameNSString, NSZeroPoint, nil);
   [[profileName cell] setLineBreakMode:NSLineBreakByTruncatingTail];
   [profileName setFont:[NSFont labelFontOfSize:fontSize]];
   [profileName sizeToFit];
   const int profileNameYOffset =
       cardYOffset +
       std::floor((kMdImageSide - NSHeight([profileName frame])) / 2);
   if (profileName.frame.size.width > availableTextWidth) {
     // Add the tooltip only if the profile name is truncated. This method to
     // test if text field is truncated is not ideal (spaces between characters
     // may be reduced to avoid truncation).
     profileName.toolTip = profileNameNSString;
   }
   [profileName
       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.
+  // Username, aligned to the leading edge of the  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)];
 
     NSString* elidedEmail =
         ElideEmail(base::UTF16ToUTF8(item.username), availableTextWidth);
     NSTextField* username = BuildLabel(
         elidedEmail, NSZeroPoint, skia::SkColorToSRGBNSColor(SK_ColorGRAY));
-    [username setFrameOrigin:NSMakePoint(xOffset, NSMaxY([profileName frame]))];
+    CGFloat usernameOffset =
+        isRTL ? NSMaxX([profileName frame]) - NSWidth([username frame])
+              : xOffset;
+    [username setFrameOrigin:NSMakePoint(usernameOffset,
+                                         NSMaxY([profileName frame]))];
     NSString* usernameNSString = base::SysUTF16ToNSString(item.username);
     if (![elidedEmail isEqualToString:usernameNSString]) {
       // Add the tooltip only if the user name is truncated.
       username.toolTip = usernameNSString;
     }
     [profileCard addSubview:username];
   }
 
   yOffset = NSMaxY([profileCard frame]);
   [container setFrameSize:NSMakeSize(kFixedMenuWidth, yOffset)];
@@ skipping 55 matching lines @@
     NSString* elidedButtonText = base::SysUTF16ToNSString(gfx::ElideText(
         l10n_util::GetStringFUTF16(
             IDS_SYNC_START_SYNC_BUTTON_LABEL,
             l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)),
         gfx::FontList(), rect.size.width, gfx::ELIDE_TAIL));
 
     [signinButton setTitle:elidedButtonText];
     [signinButton sizeToFit];
     [signinButton setTarget:self];
     [signinButton setAction:@selector(showInlineSigninPage:)];
+    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
+      NSRect buttonFrame = [signinButton frame];
+      buttonFrame.origin.x = NSWidth(rect) - NSWidth(buttonFrame);
+      [signinButton setFrame:buttonFrame];
+    }
     [container addSubview:signinButton];
 
     // Sign-in promo text.
     NSTextField* promo = BuildLabel(
         l10n_util::GetNSString(IDS_PROFILES_SIGNIN_PROMO),
         NSMakePoint(0, NSMaxY([signinButton frame]) + kVerticalSpacing),
         nil);
-    if (kRightPadding >= 8)
+    if (kRightPadding >= 8 &&
+        !cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
       rect.size.width += 8;  // Re-stretch a little bit to fit promo text.
+    }
     DCHECK(kRightPadding >= 8);
     [promo setFrameSize:NSMakeSize(rect.size.width, 0)];
     [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:promo];
     [container addSubview:promo];
 
     [container setFrameSize:NSMakeSize(rect.size.width,
                                        NSMaxY([promo frame]) +
                                            kRelatedControllVerticalSpacing)];
     base::RecordAction(
         base::UserMetricsAction("Signin_Impression_FromAvatarBubbleSignin"));
@@ skipping 39 matching lines @@
   const AvatarMenu::Item& item = avatarMenu_->GetItemAt(itemIndex);
 
   NSRect rect = NSMakeRect(0, 0, kFixedMenuWidth,
                            kBlueButtonHeight + kSmallVerticalSpacing);
   const int imageTitleSpacing = kHorizontalSpacing;
   base::scoped_nsobject<BackgroundColorHoverButton> profileButton(
       [[BackgroundColorHoverButton alloc]
               initWithFrame:rect
           imageTitleSpacing:imageTitleSpacing
             backgroundColor:GetDialogBackgroundColor()]);
-  [profileButton setRightMarginSpacing:kHorizontalSpacing];
+  [profileButton setTrailingMarginSpacing:kHorizontalSpacing];
 
   NSString* title = base::SysUTF16ToNSString(
       profiles::GetProfileSwitcherTextForItem(item));
   [profileButton setTitle:title];
 
   CGFloat availableWidth;
   [profileButton setDefaultImage:CreateProfileImage(item.icon, kIconImageSide,
                                                     profiles::SHAPE_CIRCLE)];
   availableWidth = rect.size.width - kIconImageSide - imageTitleSpacing -
                    2 * kHorizontalSpacing;
 
-  [profileButton setImagePosition:NSImageLeft];
-  [profileButton setAlignment:NSLeftTextAlignment];
+  [profileButton setImagePosition:cocoa_l10n_util::LeadingCellImagePosition()];
+  [profileButton setAlignment:NSNaturalTextAlignment];
   [profileButton setBordered:NO];
   [profileButton setTag:itemIndex];
   [profileButton setTarget:self];
   [profileButton setAction:@selector(switchToProfile:)];
 
   return profileButton.autorelease();
 }
 
 - (NSView*)createCurrentProfileAccountsView:(NSRect)rect {
   const CGFloat kAccountButtonHeight = 34;
@@ skipping 16 matching lines @@
     NSString* elidedButtonText = base::SysUTF16ToNSString(gfx::ElideText(
         l10n_util::GetStringFUTF16(
             IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON, item.name),
         gfx::FontList(), rect.size.width, gfx::ELIDE_TAIL));
 
     NSButton* addAccountsButton =
         [self linkButtonWithTitle:elidedButtonText
                       frameOrigin:NSMakePoint(
             kHorizontalSpacing, kSmallVerticalSpacing)
                            action:@selector(addAccount:)];
+    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
+      CGRect addAccountsButtonFrame = [addAccountsButton frame];
+      addAccountsButtonFrame.origin.x = NSMaxX(rect) -
+                                        NSWidth(addAccountsButtonFrame) -
+                                        NSMinX(addAccountsButtonFrame);
+      [addAccountsButton setFrame:addAccountsButtonFrame];
+    }
+
     [container addSubview:addAccountsButton];
     rect.origin.y += kAccountButtonHeight;
   }
 
   NSView* accountEmails = [self createAccountsListWithRect:NSMakeRect(
       0, rect.origin.y, rect.size.width, kAccountButtonHeight)];
   [container addSubview:accountEmails];
 
   [container setFrameSize:NSMakeSize(rect.size.width,
                                      NSMaxY([accountEmails frame]))];
@@ skipping 333 matching lines @@
 
 - (NSButton*)hoverButtonWithRect:(NSRect)rect
                             text:(NSString*)text
                            image:(NSImage*)image
                           action:(SEL)action {
   BackgroundColorHoverButton* button =
       [self hoverButtonWithRect:rect text:text action:action];
   [button setDefaultImage:image];
   [button setHoverImage:image];
   [button setPressedImage:image];
-  [button setImagePosition:NSImageLeft];
+  [button setImagePosition:cocoa_l10n_util::LeadingCellImagePosition()];
 
   return button;
 }
 
 - (BackgroundColorHoverButton*)hoverButtonWithRect:(NSRect)rect
                                               text:(NSString*)text
                                             action:(SEL)action {
   // The vector icons in hover buttons have small embeded paddings and are
   // therefore given an extra 2px in size to have a consistent look as the
   // profile icons; hence the -2.0 here to left align the hover button texts
   // with those of profile buttons.
   const int image_title_spacing = kHorizontalSpacing - 2.0;
 
   base::scoped_nsobject<BackgroundColorHoverButton> button(
       [[BackgroundColorHoverButton alloc]
               initWithFrame:rect
           imageTitleSpacing:image_title_spacing
             backgroundColor:GetDialogBackgroundColor()]);
 
   [button setTitle:text];
-  [button setAlignment:NSLeftTextAlignment];
+  [button setAlignment:NSNaturalTextAlignment];
   [button setBordered:NO];
   [button setTarget:self];
   [button setAction:action];
 
   return button.autorelease();
 }
 
 - (NSButton*)linkButtonWithTitle:(NSString*)title
                      frameOrigin:(NSPoint)frameOrigin
                           action:(SEL)action {
@@ skipping 33 matching lines @@
   if (warningImage)
     availableTextWidth -= kHorizontalSpacing;
 
   NSColor* backgroundColor = skia::SkColorToCalibratedNSColor(
       profiles::kAvatarBubbleAccountsBackgroundColor);
   base::scoped_nsobject<BackgroundColorHoverButton> button(
       [[BackgroundColorHoverButton alloc] initWithFrame:rect
                                       imageTitleSpacing:0
                                         backgroundColor:backgroundColor]);
   [button setTitle:ElideEmail(email, availableTextWidth)];
-  [button setAlignment:NSLeftTextAlignment];
+  [button setAlignment:NSNaturalTextAlignment];
   [button setBordered:NO];
   if (reauthRequired) {
     [button setDefaultImage:warningImage];
-    [button setImagePosition:NSImageLeft];
+    [button setImagePosition:cocoa_l10n_util::LeadingCellImagePosition()];
     [button setTarget:self];
     [button setAction:@selector(showAccountReauthenticationView:)];
     [button setTag:tag];
   }
 
   // Delete button.
   if (!browser_->profile()->IsSupervised()) {
     NSRect buttonRect;
     NSDivideRect(rect, &buttonRect, &rect,
-        deleteImageWidth + kHorizontalSpacing, NSMaxXEdge);
+                 deleteImageWidth + kHorizontalSpacing,
+                 cocoa_l10n_util::TrailingEdge());
     buttonRect.origin.y = 0;
 
     base::scoped_nsobject<HoverImageButton> deleteButton(
         [[HoverImageButton alloc] initWithFrame:buttonRect]);
     [deleteButton setBordered:NO];
     [deleteButton setDefaultImage:deleteImage];
     [deleteButton setHoverImage:rb->GetNativeImageNamed(
         IDR_CLOSE_1_H).ToNSImage()];
     [deleteButton setPressedImage:rb->GetNativeImageNamed(
         IDR_CLOSE_1_P).ToNSImage()];
@@ skipping 21 matching lines @@
 
 - (void)showWindow:(id)sender {
   [super showWindow:sender];
   NSEvent *event = [[NSApplication sharedApplication] currentEvent];
   if (firstProfileView_ && [event type] == NSKeyDown) {
     [[self window] makeFirstResponder:firstProfileView_];
   }
 }
 
 @end