layout: Make sure all lines are ellipsized

All lines that are too long should be ellipsized when ellipsizing is
enabled. Not just those lines where we thought they'd need to be in
advance. It might turn out that a word is too long so that we cannot
wrap it. In that case we still want to break as soon as possible, but
still ellipsize the line.

https://bugzilla.gnome.org/show_bug.cgi?id=649783

diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index dd4f391..2610f43 100644 (file)
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -5222,8 +5222,7 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
 
   /* Ellipsize the line if necessary
    */
-  if (G_UNLIKELY (state->line_width >= 0 &&
-                 should_ellipsize_current_line (line->layout, state)))
+  if (G_UNLIKELY (state->line_width >= 0 && line->layout->ellipsize))
     {
       ellipsized = _pango_layout_line_ellipsize (line, state->attrs, state->line_width);
     }