[rAC OSX] Style legal documents text.

chrome/browser/ui/cocoa/autofill/autofill_main_container.mm

 // Copyright (c) 2013 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/autofill/autofill_main_container.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_notification_container.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/range/range.h"
 
 namespace {
 
 // Padding between buttons and the last suggestion or details view. The mock
 // has a total of 30px - but 10px are already provided by details/suggestions.
 const CGFloat kButtonVerticalPadding = 20.0;
 
+// Padding around the text for the legal documents.
+const CGFloat kLegalDocumentsPadding = 20.0;
+
+// The font color for the legal documents text. Set to match the Views
+// implementation.
+const SkColor kLegalDocumentsTextColor = SkColorSetRGB(102, 102, 102);

[groby-ooo-7-16, 2013/11/22 14:03:28]

Doesn't this add a static ctor?

[Ilya Sherman, 2013/11/22 22:13:52]

Nope, because SkColor is defined as "typedef uint32_t SkColor;".

[groby-ooo-7-16, 2013/11/22 22:23:48]

Yes, but SkColorSetRGB is a function - which needs to be invoked before main()
to ensure the var is initialized...

[Ilya Sherman, 2013/11/22 22:26:38]

Pretty sure that's fine, as there aren't any objects involved.  It's not too
much different from

const int kOne = 1;
const int kTwiceOne = 2 * kOne;

+
 }  // namespace
 
 @interface AutofillMainContainer (Private)
 - (void)buildWindowButtons;
 - (void)layoutButtons;
 - (void)updateButtons;
 - (NSSize)preferredLegalDocumentSizeForWidth:(CGFloat)width;
 @end
 
 
@@ skipping 50 matching lines @@
 
   legalDocumentsView_.reset(
       [[HyperlinkTextView alloc] initWithFrame:NSZeroRect]);
   [legalDocumentsView_ setEditable:NO];
   [legalDocumentsView_ setBackgroundColor:
       [NSColor colorWithCalibratedRed:0.96
                                 green:0.96
                                  blue:0.96
                                 alpha:1.0]];
   [legalDocumentsView_ setDrawsBackground:YES];
+  [legalDocumentsView_ setTextContainerInset:
+      NSMakeSize(kLegalDocumentsPadding, kLegalDocumentsPadding)];
   [legalDocumentsView_ setHidden:YES];
   [legalDocumentsView_ setDelegate:self];
   legalDocumentsSizeDirty_ = YES;
   [[self view] addSubview:legalDocumentsView_];
 
   notificationContainer_.reset(
       [[AutofillNotificationContainer alloc] initWithDelegate:delegate_]);
   [[self view] addSubview:[notificationContainer_ view]];
 }
 
@@ skipping 147 matching lines @@
   // Now use the layout manager to compute layout.
   NSLayoutManager* layoutManager = [legalDocumentsView_ layoutManager];
   NSTextContainer* textContainer = [legalDocumentsView_ textContainer];
   [layoutManager ensureLayoutForTextContainer:textContainer];
   NSRect newFrame = [layoutManager usedRectForTextContainer:textContainer];
 
   // And finally, restore old frame.
   [legalDocumentsView_ setFrame:currentFrame];
   newFrame.size.width = width;
 
+  // Account for the padding around the text.
+  newFrame.size.height += 2 * kLegalDocumentsPadding;
+
   legalDocumentsSizeDirty_ = NO;
   legalDocumentsSize_ = newFrame.size;
   return legalDocumentsSize_;
 }
 
 - (AutofillSectionContainer*)sectionForId:(autofill::DialogSection)section {
   return [detailsContainer_ sectionForId:section];
 }
 
 - (void)modelChanged {
   [self updateSaveInChrome];
   [self updateWalletIcon];
   [self updateButtons];
   [detailsContainer_ modelChanged];
 }
 
 - (BOOL)saveDetailsLocally {
   return [saveInChromeCheckbox_ state] == NSOnState;
 }
 
 - (void)updateLegalDocuments {
   NSString* text = base::SysUTF16ToNSString(delegate_->LegalDocumentsText());
 
   if ([text length]) {
-    NSFont* font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
-    [legalDocumentsView_ setMessage:text
-                           withFont:font
-                       messageColor:[NSColor blackColor]];
+    NSFont* font =
+        [NSFont labelFontOfSize:[[legalDocumentsView_ font] pointSize]];
+    NSColor* color = gfx::SkColorToCalibratedNSColor(kLegalDocumentsTextColor);
+    [legalDocumentsView_ setMessage:text withFont:font messageColor:color];
 
     const std::vector<gfx::Range>& link_ranges =
         delegate_->LegalDocumentLinks();
     for (size_t i = 0; i < link_ranges.size(); ++i) {
       NSRange range = link_ranges[i].ToNSRange();
       [legalDocumentsView_ addLinkRange:range
                                withName:@(i)
                               linkColor:[NSColor blueColor]];
     }
     legalDocumentsSizeDirty_ = YES;
@@ skipping 61 matching lines @@
 
 - (NSImageView*)buttonStripImageForTesting {
   return buttonStripImage_.get();
 }
 
 - (NSImageView*)saveInChromeTooltipForTesting {
   return saveInChromeTooltip_.get();
 }
 
 @end