[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),
+    : specified_line_height_(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::SetLineHeight(int line_height) {
+  specified_line_height_ = line_height;
+  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 = specified_line_height_ > 0 ? specified_line_height_
+      : CalculateLineHeight(font_list_);
   // 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());
     if (!dry_run) {
       label->SetBoundsRect(gfx::Rect(
           gfx::Point(GetInsets().left() + x - focus_border_insets.left(),
                      GetInsets().top() + line * line_height -
                          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());
+  // The last line shouldn't extend past the text, so use CalculateLineHeight()

[Evan Stade, 2014/07/15 22:46:28]

"The last line shouldn't extend past the text"

It took me a while to grok this^. Consider:

"The user-specified line height only applies to interline spacing, so the final
line's height is unaffected."

[Garrett Casto, 2014/07/16 07:38:23]

Done.

+  // instead of the possibly user specified |line_height| for that line.
+  int total_height = line * line_height +
+      CalculateLineHeight(font_list_) + GetInsets().height();
+  return gfx::Size(width, total_height);
 }
 
 }  // namespace views