summaryrefslogtreecommitdiff
path: root/pango/ellipsize.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-01-16 13:16:32 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-01-16 13:16:32 +0000
commit9028047d34e7c856947556d9b0cef900aae731c2 (patch)
treef2c8109b76c2d44b3e01ee8d03c0f4fe6f16c1d6 /pango/ellipsize.c
parent8c5c6f6259b17cf63859d26b28ab22eedfee7e86 (diff)
downloadpango-9028047d34e7c856947556d9b0cef900aae731c2.tar.gz
Fix width calculation. Was causing ellipsization to stop at a zero-width
2007-01-16 Behdad Esfahbod <behdad@gnome.org> * pango/ellipsize.c (get_cluster_width): Fix width calculation. Was causing ellipsization to stop at a zero-width glyph that was part of a bigger cluster. * pango/ellipsize.c (remove_one_span): Skip over zero-width clusters, otherwise ellipsization will stop at a zero-width cluster. * pango/pango-glyph-item.c (_pango_glyph_item_iter_next_cluster), (_pango_glyph_item_iter_prev_cluster): Fix yet another bug with in prev_cluster that was making it not work for any interesting cluster. svn path=/trunk/; revision=2158
Diffstat (limited to 'pango/ellipsize.c')
-rw-r--r--pango/ellipsize.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/pango/ellipsize.c b/pango/ellipsize.c
index e392d3c9..052ae5d8 100644
--- a/pango/ellipsize.c
+++ b/pango/ellipsize.c
@@ -174,12 +174,12 @@ get_cluster_width (LineIter *iter)
if (run_iter->start_glyph < run_iter->end_glyph) /* LTR */
{
for (i = run_iter->start_glyph; i < run_iter->end_glyph; i++)
- width += glyphs->glyphs[run_iter->start_glyph].geometry.width;
+ width += glyphs->glyphs[i].geometry.width;
}
else /* RTL */
{
for (i = run_iter->start_glyph; i > run_iter->end_glyph; i--)
- width += glyphs->glyphs[run_iter->start_glyph].geometry.width;
+ width += glyphs->glyphs[i].geometry.width;
}
return width;
@@ -564,6 +564,7 @@ remove_one_span (EllipsizeState *state)
LineIter new_gap_end_iter;
int new_gap_start_x;
int new_gap_end_x;
+ int width;
/* Find one span backwards and forward from the gap
*/
@@ -573,9 +574,11 @@ remove_one_span (EllipsizeState *state)
{
if (!line_iter_prev_cluster (state, &new_gap_start_iter))
break;
- new_gap_start_x -= get_cluster_width (&new_gap_start_iter);
+ width = get_cluster_width (&new_gap_start_iter);
+ new_gap_start_x -= width;
}
- while (!starts_at_ellipsization_boundary (state, &new_gap_start_iter));
+ while (!starts_at_ellipsization_boundary (state, &new_gap_start_iter) ||
+ width == 0);
new_gap_end_iter = state->gap_end_iter;
new_gap_end_x = state->gap_end_x;
@@ -583,9 +586,11 @@ remove_one_span (EllipsizeState *state)
{
if (!line_iter_next_cluster (state, &new_gap_end_iter))
break;
- new_gap_end_x += get_cluster_width (&new_gap_end_iter);
+ width = get_cluster_width (&new_gap_end_iter);
+ new_gap_end_x += width;
}
- while (!ends_at_ellipsization_boundary (state, &new_gap_end_iter));
+ while (!ends_at_ellipsization_boundary (state, &new_gap_end_iter) ||
+ width == 0);
if (state->gap_end_x == new_gap_end_x && state->gap_start_x == new_gap_start_x)
return FALSE;