Mac: Fix broken website settings bubble when using Right-to-Left languages.

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_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/website_settings/website_settings_bubble_controller.h"
 
 #include <cmath>
 
 #import <AppKit/AppKit.h>
 
@@ skipping 206 matching lines @@
   NSDrawThreePartImage(backgroundRect,
                        tabstripRightImage_,
                        tabstripCenterImage_,
                        nil,
                        /*vertical=*/ NO,
                        NSCompositeSourceOver,
                        1,
                        /*flipped=*/ YES);
 
   // Call the superclass method to trigger drawing of the tab labels.
-  [self drawInteriorWithFrame:cellFrame inView:controlView];
+  NSRect interiorFrame = cellFrame;
+  interiorFrame.size.width = 0;
+  for (NSInteger i = 0; i < [self segmentCount]; ++i)
+    interiorFrame.size.width += [self widthForSegment:i];
+  [self drawInteriorWithFrame:interiorFrame inView:controlView];

[Andre, 2015/04/04 00:17:48]

Without this fix, the text will draw on the right side of the view while the
tabs draw on the left.
NSSegmentedControl does not really support padding outside the segment widths.

+
   if ([[controlView window] firstResponder] == controlView)
     [self drawFocusRect];
 }
 
 - (void)drawFocusRect {
   gfx::ScopedNSGraphicsContextSaveGState scoped_state;
   NSSetFocusRingStyle(NSFocusRingOnly);
   [[NSColor keyboardFocusIndicatorColor] set];
   NSFrameRect([self hitRectForSegment:keySegment_]);
 }
 
+// Returns the segment number for the left-most positioned segment.
+// On Right-to-Left languages, segment 0 is on the right.
+- (NSInteger)leftSegment {
+  BOOL isRTL = [self userInterfaceLayoutDirection] ==
+                   NSUserInterfaceLayoutDirectionRightToLeft;
+  return isRTL ? [self segmentCount] - 1 : 0;
+}
+
 // Return the hit rect (i.e., the visual bounds of the tab) for
 // the given segment.
 - (NSRect)hitRectForSegment:(NSInteger)segment {
   CGFloat tabstripHeight = [tabCenterImage_ size].height;
   DCHECK_GT(tabstripHeight, kTabHeight);
-
-  NSRect rect = NSMakeRect(0, tabstripHeight - kTabHeight,
-                           [self widthForSegment:segment], kTabHeight);
-  for (NSInteger i = 0; i < segment; ++i) {
-    rect.origin.x += [self widthForSegment:i];
-  }
-  int xAdjust = segment == 0 ? kTabStripXPadding : 0;
-  rect.size.width = std::floor(
-      [self widthForSegment:segment] - kTabSpacing - xAdjust);
-  rect.origin.x = std::floor(rect.origin.x + kTabSpacing / 2 + xAdjust);
-
-  return rect;
+  DCHECK([self segmentCount] == 2);  // Assume 2 segments to keep things simple.
+  NSInteger leftSegment = [self leftSegment];
+  CGFloat xOrigin = segment == leftSegment ? kTabStripXPadding
+                                           : [self widthForSegment:leftSegment];
+  NSRect rect = NSMakeRect(xOrigin, tabstripHeight - kTabHeight,
+                           [self widthForSegment:segment] - kTabStripXPadding,
+                           kTabHeight);
+  return NSInsetRect(rect, kTabSpacing / 2, 0);
 }
 
 - (void)drawSegment:(NSInteger)segment
             inFrame:(NSRect)tabFrame
            withView:(NSView*)controlView {
   // Adjust the tab's frame so that the label appears centered in the tab.
-  if (segment == 0) {
+  if (segment == [self leftSegment])
     tabFrame.origin.x += kTabStripXPadding;
-    tabFrame.size.width -= kTabStripXPadding;
-  }
+  tabFrame.size.width -= kTabStripXPadding;
   tabFrame.origin.y += kTabLabelTopPadding;
   tabFrame.size.height -= kTabLabelTopPadding;
 
   // Center the label's frame in the tab's frame.
   NSString* label = [self labelForSegment:segment];
   NSDictionary* textAttributes =
       [WebsiteSettingsTabSegmentedCell textAttributes];
   NSSize textSize = [label sizeWithAttributes:textAttributes];
   NSRect labelFrame;
   labelFrame.size = textSize;
@@ skipping 181 matching lines @@
 
   DCHECK_EQ([segmentedControl_ segmentCount], WebsiteSettingsUI::NUM_TAB_IDS);
 
   // Make both tabs the width of the widest. The first segment has some
   // additional padding that is not part of the tab, which is used for drawing
   // the background of the tab strip.
   tabWidth = std::max(tabWidth,
                       textSize.width + 2 * kTabLabelXPadding);
   [segmentedControl_ setWidth:tabWidth + kTabStripXPadding
                    forSegment:WebsiteSettingsUI::TAB_ID_PERMISSIONS];
-  [segmentedControl_ setWidth:tabWidth
+  [segmentedControl_ setWidth:tabWidth + kTabStripXPadding

[Andre, 2015/04/04 00:17:49]

Give padding to this segment as well, because on RTL layout this segment is on
the left.

                    forSegment:WebsiteSettingsUI::TAB_ID_CONNECTION];
 
   [segmentedControl_ setFont:[textAttributes objectForKey:NSFontAttributeName]];
   [contentView_ addSubview:segmentedControl_];
 
   NSRect tabFrame = NSMakeRect(0, 0, [self defaultWindowWidth], 300);
   tabView_.reset([[NSTabView alloc] initWithFrame:tabFrame]);
   [tabView_ setTabViewType:NSNoTabsNoBorder];
   [tabView_ setDrawsBackground:NO];
   [tabView_ setControlSize:NSSmallControlSize];
@@ skipping 801 matching lines @@
   [bubble_controller_ setPermissionInfo:permission_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   [bubble_controller_ setSelectedTab:tab_id];
 }