projects
/
platform
/
upstream
/
pango.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d415fb6
)
Revert "layout: Make sure all lines are ellipsized"
author
Behdad Esfahbod
<behdad@behdad.org>
Wed, 15 Jun 2011 15:29:48 +0000
(11:29 -0400)
committer
Behdad Esfahbod
<behdad@behdad.org>
Wed, 15 Jun 2011 15:29:48 +0000
(11:29 -0400)
This reverts commit
00d2842d8a5ded059fc058d05b2cffcf16186710
.
pango/pango-layout.c
patch
|
blob
|
history
diff --git
a/pango/pango-layout.c
b/pango/pango-layout.c
index
4e21e25
..
40f92fa
100644
(file)
--- a/
pango/pango-layout.c
+++ b/
pango/pango-layout.c
@@
-5220,7
+5220,8
@@
pango_layout_line_postprocess (PangoLayoutLine *line,
/* Ellipsize the line if necessary
*/
- if (G_UNLIKELY (state->line_width >= 0 && line->layout->ellipsize))
+ if (G_UNLIKELY (state->line_width >= 0 &&
+ should_ellipsize_current_line (line->layout, state)))
{
ellipsized = _pango_layout_line_ellipsize (line, state->attrs, state->line_width);
}