diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-01-23 00:15:32 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-01-23 00:15:32 +0000 |
| commit | 55bdaf842fb6cf02eae9bbbb1a6e48bfbed021cf (patch) | |
| tree | a582e1d72376f0a757ae4e91835ff78c011f514c | |
| parent | a32f6025da958da04bb7df72aba2776933357ed0 (diff) | |
| download | pango-55bdaf842fb6cf02eae9bbbb1a6e48bfbed021cf.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pango/pango-glyph-item.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -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 94f07881..6d5c5d98 100644 --- 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--; |