From d0f840d93f59eeabaeea989f883ab2af796d88b7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 23 Jan 2007 00:20:52 +0000 Subject: Fix the "menu accels are two chars wide" bug that was introduced by the 2007-01-22 Behdad Esfahbod * pango/pango-glyph-item.c (_pango_glyph_item_iter_next_cluster): Fix the "menu accels are two chars wide" bug that was introduced by the recent changes in this function, in 1.15.4. Apparently glyph_index means separate things in next_cluster and prev_cluster. svn path=/branches/pango-1-14/; revision=2181 --- ChangeLog | 7 +++++++ pango/pango-glyph-item.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ea1a233..d0fc6a15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-22 Behdad Esfahbod + + * pango/pango-glyph-item.c (_pango_glyph_item_iter_next_cluster): + Fix the "menu accels are two chars wide" bug that was introduced + by the recent changes in this function, in 1.15.4. Apparently + glyph_index means separate things in next_cluster and prev_cluster. + 2007-01-17 Behdad Esfahbod Bug 395328 – Map kATSDeletedGlyphcode to PANGO_GLYPH_EMPTY diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c index 0030cda8..2506866a 100644 --- a/pango/pango-glyph-item.c +++ b/pango/pango-glyph-item.c @@ -183,7 +183,7 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter) if (LTR (iter->glyph_item)) { - cluster = glyphs->log_clusters[glyph_index + 1]; + cluster = glyphs->log_clusters[glyph_index]; while (TRUE) { glyph_index++; @@ -206,7 +206,7 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter) } else /* RTL */ { - cluster = glyphs->log_clusters[glyph_index - 1]; + cluster = glyphs->log_clusters[glyph_index]; while (TRUE) { glyph_index--; -- cgit v1.2.1