Make StyledLabel wrap long words

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 <limits>
 #include <vector>
 
 #include "base/strings/string_util.h"
@@ skipping 263 matching lines @@
     // style may differ from the base font. The font specified by the range
     // should be used when eliding text.
     if (position >= range.start()) {
       text_font_list = text_font_list.DeriveWithStyle(
           current_range->style_info.font_style);
     }
     gfx::ElideRectangleText(remaining_string,
                             text_font_list,
                             chunk_bounds.width(),
                             chunk_bounds.height(),
-                            gfx::IGNORE_LONG_WORDS,
+                            gfx::TRUNCATE_LONG_WORDS,

[msw, 2015/05/13 23:05:39]

Why doesn't this use WRAP_LONG_WORDS?

[tbarzic, 2015/05/14 00:02:28]

WRAP_LONG_WORDS didn't work in first patch because it always requires that at
least one character remains on the first line (should be fine now though, since
we go to the next line when whole first line gets used).

                             &substrings);
 
-    DCHECK(!substrings.empty());
-    base::string16 chunk = substrings[0];
+    base::string16 chunk =
+        substrings.empty() ? base::string16() : substrings[0];
     if (chunk.empty()) {

[msw, 2015/05/13 23:05:39]

nit: declare/assign |chunk| below this block and change this to check if
(substrings.empty() || substrings[0].empty())

[tbarzic, 2015/05/14 00:02:28]

Done.

       // Nothing fits on this line. Start a new line.
       // If x is 0, first line may have leading whitespace that doesn't fit in a
       // single line, so try trimming those. Otherwise there is no room for
       // anything; abort.
       if (x == 0) {
         if (line == 0) {
           base::TrimWhitespace(remaining_string, base::TRIM_LEADING,
                                &remaining_string);
           continue;
         }
         break;
       }
 
       x = 0;
       line++;
       continue;
     }
 
     scoped_ptr<Label> label;
+    bool whole_chunk_used = true;
     if (position >= range.start()) {
       const RangeStyleInfo& style_info = current_range->style_info;
 
       if (style_info.disable_line_wrapping && chunk.size() < range.length() &&
           position == range.start() && x != 0) {
         // If the chunk should not be wrapped, try to fit it entirely on the
         // next line.
         x = 0;
         line++;
         continue;
       }
 
-      chunk = chunk.substr(0, std::min(chunk.size(), range.end() - position));
+      if (chunk.size() > range.end() - position) {
+        whole_chunk_used = false;
+        chunk = chunk.substr(0, range.end() - position);
+      }
 
       label = CreateLabelRange(chunk, font_list_, style_info, this);
 
       if (style_info.is_link && !dry_run)
         link_targets_[label.get()] = range;
 
       if (position + chunk.size() >= range.end())
         ++current_range;
     } else {
       // This chunk is normal text.
-      if (position + chunk.size() > range.start())
+      if (position + chunk.size() > range.start()) {
+        whole_chunk_used = false;
         chunk = chunk.substr(0, range.start() - position);
+      }
       label = CreateLabelRange(chunk, font_list_, default_style_info_, this);
     }
 
     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();
     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();
     used_width = std::max(used_width, x);
 
+    if (substrings.size() > 1 && whole_chunk_used) {

[msw, 2015/05/13 23:05:39]

I don't think you need |whole_chunk_used|, can you just check chunk.size() <
substrings[0].size(). Also, can you add a comment here? The existing code is
hard to follow, and any clarification will help.

[tbarzic, 2015/05/14 00:02:28]

Done.

+      x = 0;
+      ++line;
+    }
+
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   DCHECK_LE(used_width, width);
   // The user-specified line height only applies to interline spacing, so the
   // final line's height is unaffected.
   int total_height = line * line_height +
       CalculateLineHeight(font_list_) + GetInsets().height();
   calculated_size_ = gfx::Size(used_width + GetInsets().width(), total_height);
   return calculated_size_;
 }
 
 }  // namespace views