summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-04-18 23:15:30 +0200
committerMatthias Clasen <mclasen@redhat.com>2011-06-13 07:03:19 -0400
commit00d2842d8a5ded059fc058d05b2cffcf16186710 (patch)
treeca4b947fc8ec8c3f80cecdab1e584e6fdef43614
parent8e0fa0d1ab97c256829dab28a5c371689584bcd3 (diff)
downloadpango-00d2842d8a5ded059fc058d05b2cffcf16186710.tar.gz
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
-rw-r--r--pango/pango-layout.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index dd4f3913..2610f431 100644
--- 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);
}