[Password Generation] Update Aura UI

ui/views/controls/styled_label.cc

 // 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.
 
 #include "ui/views/controls/styled_label.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "ui/gfx/font_list.h"
@@ skipping 76 matching lines @@
 bool StyledLabel::StyleRange::operator<(
     const StyledLabel::StyleRange& other) const {
   return range.start() < other.range.start();
 }
 
 
 // StyledLabel ----------------------------------------------------------------
 
 StyledLabel::StyledLabel(const base::string16& text,
                          StyledLabelListener* listener)
-    : listener_(listener),
+    : interline_spacing_(0),
+      listener_(listener),
       displayed_on_background_color_set_(false),
       auto_color_readability_enabled_(true) {
   base::TrimWhitespace(text, base::TRIM_TRAILING, &text_);
 }
 
 StyledLabel::~StyledLabel() {}
 
 void StyledLabel::SetText(const base::string16& text) {
   text_ = text;
   style_ranges_.clear();
@@ skipping 18 matching lines @@
   style_ranges_.merge(new_range);
 
   PreferredSizeChanged();
 }
 
 void StyledLabel::SetDefaultStyle(const RangeStyleInfo& style_info) {
   default_style_info_ = style_info;
   PreferredSizeChanged();
 }
 
+void StyledLabel::SetInterlineSpacing(int interline_spacing) {
+  interline_spacing_ = interline_spacing;
+  PreferredSizeChanged();
+}
+
 void StyledLabel::SetDisplayedOnBackgroundColor(SkColor color) {
   displayed_on_background_color_ = color;
   displayed_on_background_color_set_ = true;
 }
 
 gfx::Insets StyledLabel::GetInsets() const {
   gfx::Insets insets = View::GetInsets();
 
   // We need a focus border iff we contain a link that will have a focus border.
   // That in turn will be true only if the link is non-empty.
@@ skipping 40 matching lines @@
 gfx::Size StyledLabel::CalculateAndDoLayout(int width, bool dry_run) {
   if (!dry_run) {
     RemoveAllChildViews(true);
     link_targets_.clear();
   }
 
   width -= GetInsets().width();
   if (width <= 0 || text_.empty())
     return gfx::Size();
 
-  const int line_height = CalculateLineHeight(font_list_);
+  const int line_height = CalculateLineHeight(font_list_) + interline_spacing_;
   // The index of the line we're on.
   int line = 0;
   // The x position (in pixels) of the line we're on, relative to content
   // bounds.
   int x = 0;
 
   base::string16 remaining_string = text_;
   StyleRanges::const_iterator current_range = style_ranges_.begin();
 
   // Iterate over the text, creating a bunch of labels and links and laying them
@@ skipping 81 matching lines @@
 
     if (displayed_on_background_color_set_)
       label->SetBackgroundColor(displayed_on_background_color_);
     label->SetAutoColorReadabilityEnabled(auto_color_readability_enabled_);
 
     // Calculate the size of the optional focus border, and overlap by that
     // amount. Otherwise, "<a>link</a>," will render as "link ,".
     gfx::Insets focus_border_insets(label->GetInsets());
     focus_border_insets += -label->View::GetInsets();
     const gfx::Size view_size = label->GetPreferredSize();
-    DCHECK_EQ(line_height, view_size.height() - focus_border_insets.height());
+    DCHECK_EQ(line_height - interline_spacing_,
+              view_size.height() - focus_border_insets.height());
     if (!dry_run) {
       label->SetBoundsRect(gfx::Rect(
           gfx::Point(GetInsets().left() + x - focus_border_insets.left(),
                      GetInsets().top() + line * line_height -

[Evan Stade, 2014/06/19 00:16:36]

I have a feeling setting a taller line height ought to affect the vertical
position of the first line of text.

[Garrett Casto, 2014/06/20 23:47:01]

It actually doesn't affect the position of the first line, but it does add
additional space after the last line. This doesn't matter for my particular
case, but in retrospect this should be pretty easy to fix.

[Evan Stade, 2014/06/23 18:20:40]

Right, it doesn't, but it ought to. CSS line-height does.

[Garrett Casto, 2014/06/24 01:15:12]

Ah, so you want the text to be centered in the line height. I guess I'm trying
to determine how we want this to be used. Do you think that this should be like
line-height because it's what developers are used to or because it's how
designers will draw up redlines? I don't know much about the former, and I'm a
complete CSS noob, but actually matching mocks seems like it's more difficult
with this behavior. If you have a well defined border around text but you want
the text to be spread larger than normal, you need to account for the additional
spacing when determining the border.

I suppose you could argue that the borders should dynamically change as the text
size changes, but that doesn't seem to be something that normally happens in
Chrome UI (that I can tell).

[Evan Stade, 2014/06/24 21:16:58]

this^. It's what CSS does, and CSS is a mature library in widespread use, so
it's probably like that for a good reason. Even if there's no good reason, CSS
still defines convention imo.
I do think they should, but I will admit that Chrome frequently gets it wrong
(probably "always" if we're talking about native UI).

                          focus_border_insets.top()),
           view_size));
       AddChildView(label.release());
     }
     x += view_size.width() - focus_border_insets.width();
 
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   return gfx::Size(width, (line + 1) * line_height + GetInsets().height());
 }
 
 }  // namespace views