Page Info (native Mac): truncate permission labels and add tooltip.

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"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 67 matching lines @@
 const CGFloat kSecurityParagraphSpacing = 12;
 
 // Site Settings Section -------------------------------------------------------
 
 // Square size of the permission images.
 const CGFloat kPermissionImageSize = 16;
 
 // Spacing between a permission image and the text.
 const CGFloat kPermissionImageSpacing = 6;
 
+// Minimum distance between the label and its corresponding menu.
+const CGFloat kMinSeparationBetweenLabelAndMenu = 16;
+
 // Square size of the permission delete button image.
 const CGFloat kPermissionDeleteImageSize = 16;
 
 // The spacing between individual permissions.
 const CGFloat kPermissionsVerticalSpacing = 16;
 
 // Amount to lower each permission icon to align the icon baseline with the
 // label text.
 const CGFloat kPermissionIconYAdjustment = 1;
 
@@ skipping 759 matching lines @@
                   atPoint:point];
     [label sizeToFit];
 
     position = NSMakePoint(NSMaxX([label frame]),
                            point.y + kPermissionPopupButtonYAdjustment);
 
     button = [self addPopUpButtonForPermission:permissionInfo
                                         toView:view
                                        atPoint:position];
   }
+  [label setToolTip:base::SysUTF16ToNSString(labelText)];
 
   [view setFrameSize:NSMakeSize(viewWidth, NSHeight([view frame]))];
 
   // Adjust the vertical position of the button so that its title text is
   // aligned with the label. Assumes that the text is the same size in both.
   // Also adjust the horizontal position to remove excess space due to the
   // invisible bezel.
   NSRect titleRect = [[button cell] titleRectForBounds:[button bounds]];
   if (isRTL) {
     position.x = kSectionHorizontalPadding;
   } else {
     position.x = kDefaultWindowWidth - kSectionHorizontalPadding -
                  [button frame].size.width;
   }
   position.y -= titleRect.origin.y;
   [button setFrameOrigin:position];
 
+  // Truncate the label if it's too wide.
+  // This is a workaround for https://crbug.com/654268 until MacViews ships.
+  NSRect labelFrame = [label frame];
+  if (isRTL) {
+    CGFloat maxLabelWidth = NSMaxX(labelFrame) - NSMaxX([button frame]) -
+                            kMinSeparationBetweenLabelAndMenu;
+    if (NSWidth(labelFrame) > maxLabelWidth) {
+      labelFrame.origin.x = NSMaxX(labelFrame) - maxLabelWidth;
+      labelFrame.size.width = maxLabelWidth;
+      [label setFrame:labelFrame];

[Robert Sesek, 2016/11/03 00:04:31]

These two lines are duplicated within the two branches. Collapse?

[lgarron, 2016/11/03 00:05:21]

They are conditional within both branches. Do you have a way to share the code
without using more lines?

[lgarron, 2016/11/03 00:15:00]

Note that putting this inside the conditional inside for RTL is necessary, else
the RTL text will be aligned on the wrong side.
(I could try to set text direction or alignment inside `label` for RTL instead,
but I didn't quickly find the "right" way to do that.)

+      [[label cell] setLineBreakMode:NSLineBreakByTruncatingTail];
+    }
+  } else {
+    CGFloat maxLabelWidth = NSMinX([button frame]) - NSMinX(labelFrame) -
+                            kMinSeparationBetweenLabelAndMenu;
+    if (NSWidth(labelFrame) > maxLabelWidth) {
+      labelFrame.size.width = maxLabelWidth;
+      [label setFrame:labelFrame];
+      [[label cell] setLineBreakMode:NSLineBreakByTruncatingTail];
+    }
+  }
+
   // Align the icon with the text.
   [self alignPermissionIcon:imageView withTextField:label];
 
   // Permissions specified by policy or an extension cannot be changed.
   if (permissionInfo.source == content_settings::SETTING_SOURCE_EXTENSION ||
       permissionInfo.source == content_settings::SETTING_SOURCE_POLICY) {
     [button setEnabled:NO];
   }
 
   NSRect buttonFrame = [button frame];
@@ skipping 305 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }