[rAc] [OSX] Reduce gap between "shipping address" label and the shipping address.

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

 // Copyright 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_suggestion_container.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 // Technically, CGFLOAT_MAX should do. Practically, it runs into several issues.
 // #1) Many computations on Retina devices overflow with that value.
 // #2) In this particular use case, it results in the message
 //     "CGAffineTransformInvert: singular matrix."
 const CGFloat kInfiniteSize = 1.0e6;
 
 // A line fragment padding that creates the same visual look as text layout in
 // an NSTextField does. (Which UX feedback was based on)
 const CGFloat kLineFragmentPadding = 2.0;
 
-// Padding added on top of the label so its first line looks centered with
-// respect to the input field.
-const CGFloat kLabelTopPadding = 5.0;
-
 }
 
 // An attachment cell for a single icon - takes care of proper alignment of
 // text and icon.
 @interface IconAttachmentCell : NSTextAttachmentCell {
   CGFloat baseline_;  // The cell's baseline adjustment.
 }
 
 // Adjust the cell's baseline so that the lower edge of the image aligns with
 // the longest descender, not the font baseline
@@ skipping 50 matching lines @@
 
 - (void)loadView {
   label_.reset([[NSTextView alloc] initWithFrame:NSZeroRect]);
   [[label_ textContainer] setLineFragmentPadding:kLineFragmentPadding];
   [label_ setEditable:NO];
   [label_ setSelectable:NO];
   [label_ setDrawsBackground:NO];
 
   base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
       [[NSMutableParagraphStyle alloc] init]);
-  [paragraphStyle setLineHeightMultiple:1.5];
+  [paragraphStyle setLineSpacing:0.5 * [[label_ font] pointSize]];
   [label_ setDefaultParagraphStyle:paragraphStyle];
 
   inputField_.reset([[AutofillTextField alloc] initWithFrame:NSZeroRect]);
   [inputField_ setHidden:YES];
 
   spacer_.reset([[NSBox alloc] initWithFrame:NSZeroRect]);
   [spacer_ setBoxType:NSBoxSeparator];
   [spacer_ setBorderType:NSLineBorder];
 
   base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
@@ skipping 41 matching lines @@
 
   // Enforce fixed width.
   NSSize frameSize = NSMakeSize(autofill::kFieldWidth,
                                 NSHeight([inputField_ frame]));
   [inputField_ setFrameSize:frameSize];
 }
 
 
 - (NSSize)preferredSize {
   NSSize size = [label_ bounds].size;
-  size.height += kLabelTopPadding;
 
   // Final inputField_ sizing/spacing depends on a TODO(estade) in Views code.
   if (![inputField_ isHidden]) {
     size.height = std::max(size.height, NSHeight([inputField_ frame]));
     size.width += NSWidth([inputField_ frame])  + kAroundTextPadding;
   }
 
   size.height += kTopPadding;
 
   return size;
 }
 
 - (void)performLayout {
   NSRect bounds = [[self view] bounds];
   NSSize preferredContainerSize = [self preferredSize];
   // width is externally determined.
   preferredContainerSize.width = NSWidth(bounds);
 
   NSRect spacerFrame = NSMakeRect(0, preferredContainerSize.height - 1,
                                   preferredContainerSize.width, 1);
 
   NSRect labelFrame = [label_ bounds];
   labelFrame.origin.x = NSMinX(bounds);
-  labelFrame.origin.y =
-      NSMaxY(bounds) - kLabelTopPadding - NSHeight(labelFrame) - kTopPadding;
+  labelFrame.origin.y = NSMaxY(bounds) - NSHeight(labelFrame) - kTopPadding;
 
   // Position input field - top is aligned to top of label field.
   if (![inputField_ isHidden]) {
-    NSRect inputfieldFrame = [inputField_ frame];
-    inputfieldFrame.origin.x = NSMaxX(bounds) - NSWidth(inputfieldFrame);
-    inputfieldFrame.origin.y =
-        NSMaxY(labelFrame) + kLabelTopPadding - NSHeight(inputfieldFrame);
-    [inputField_ setFrameOrigin:inputfieldFrame.origin];
+    NSRect inputFieldFrame = [inputField_ frame];
+    inputFieldFrame.origin.x = NSMaxX(bounds) - NSWidth(inputFieldFrame);
+    inputFieldFrame.origin.y = NSMaxY(labelFrame) - NSHeight(inputFieldFrame);
+    [inputField_ setFrameOrigin:inputFieldFrame.origin];
+
+    // Vertically center the label with respect to the input field.
+    labelFrame.origin.y -=
+        roundf((NSHeight(inputFieldFrame) - NSHeight(labelFrame)) / 2.0);

[groby-ooo-7-16, 2013/12/13 19:25:20]

I'm still not sure this works - if the label is multi-line, this will produce
odd results :)

I used the manual futz factor since it's a rather painful process to get the
first line's size. If you want to do it:

Get text container, get layout manager
Get range for first line of text ([textContainer lineRangeForRange:...])
Get glyph range ([layoutManager getGlyphRangeForCharacterRange:...])
Get the bounding rect ([layoutManager boundingRectForGlyphRange:...])

Or, just add 5 :)

[Ilya Sherman, 2013/12/14 00:03:06]

Is there ever a case where the label is multi-line?  (Does that happen with
Wallet's CVV challenges?  I couldn't get Wallet to work enough to test this...
:/)

I got rid of the manual futz factor because it was adding too much padding for
lines that don't have an inputField.  I suppose I could add it back just for
cases when an input field is present.  Does that sound reasonable to you? :)

[groby-ooo-7-16, 2013/12/14 00:08:40]

Hm. Looking at the mocks, it seems the CVV challenge is only ever a single line
- so maybe this is good "as is". I'd add the futz factor if there is an input
field, just in case...

[Ilya Sherman, 2013/12/14 01:15:26]

Alright, added the manual futz factor back in, but only when there is an input
field.

 
     // Due to fixed width, fields are guaranteed to not overlap.
-    DCHECK_LE(NSMaxX(labelFrame), NSMinX(inputfieldFrame));
+    DCHECK_LE(NSMaxX(labelFrame), NSMinX(inputFieldFrame));
   }
 
   [spacer_ setFrame:spacerFrame];
   [label_ setFrame:labelFrame];
   [[self view] setFrameSize:preferredContainerSize];
 }
 
 @end