summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--pango/pango-glyph-item.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a83833c..0557eaa1 100644
--- 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 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--;