Fix the "menu accels are two chars wide" bug that was introduced by the

2007-01-22  Behdad Esfahbod  <behdad@gnome.org>

        * 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=/trunk/; revision=2179

diff --git a/ChangeLog b/ChangeLog
index 7a83833..0557eaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-01-22  Behdad Esfahbod  <behdad@gnome.org>
 
+       * 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-22  Behdad Esfahbod  <behdad@gnome.org>
+
        * pango/fonts.c (pango_font_get_metrics): Populate metrics for
        NULL/broken fonts.  Now our glyph boxes have underlines too. Yay!
 

diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c
index 94f0788..6d5c5d9 100644 (file)
--- a/pango/pango-glyph-item.c
+++ b/pango/pango-glyph-item.c
@@ -182,7 +182,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++;
@@ -205,7 +205,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--;