summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-03-02 22:57:59 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-03-02 22:57:59 +0000
commitfc7d503db9078b7bb24f667cda65b8cf6c82f172 (patch)
tree1097f912fff36ff82800c0f2c69f0fbd56ac4c1c
parentd887e66dc5497ac0af84d9e22af6b98f4cc5d99e (diff)
downloadpango-fc7d503db9078b7bb24f667cda65b8cf6c82f172.tar.gz
Go back to using Xft-reported metrics for all non-transformed fonts.
2005-03-02 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents): Go back to using Xft-reported metrics for all non-transformed fonts. Reporting non-integer glyph metrics for fonts where people have disabled hinting in their config causes various problems. (reported variously, including #167801, Adam Sampson)
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-1-109
-rw-r--r--pango/pangoxft-font.c2
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 922bf540..13ee4cca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
2005-03-02 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
+ Go back to using Xft-reported metrics for all non-transformed
+ fonts. Reporting non-integer glyph metrics for fonts
+ where people have disabled hinting in their config causes
+ various problems. (reported variously, including #167801,
+ Adam Sampson)
+
+2005-03-02 Owen Taylor <otaylor@redhat.com>
Redo the handling of absolute sizes for PangoAttribute
to work around compatibility problems with GtkHTML which
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 922bf540..13ee4cca 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,4 +1,13 @@
2005-03-02 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
+ Go back to using Xft-reported metrics for all non-transformed
+ fonts. Reporting non-integer glyph metrics for fonts
+ where people have disabled hinting in their config causes
+ various problems. (reported variously, including #167801,
+ Adam Sampson)
+
+2005-03-02 Owen Taylor <otaylor@redhat.com>
Redo the handling of absolute sizes for PangoAttribute
to work around compatibility problems with GtkHTML which
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 210a939a..7af080c7 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -313,7 +313,7 @@ pango_xft_font_get_glyph_extents (PangoFont *font,
}
else if (glyph)
{
- if (!fcfont->is_transformed && fcfont->is_hinted)
+ if (!fcfont->is_transformed)
get_glyph_extents_xft (fcfont, glyph, ink_rect, logical_rect);
else
get_glyph_extents_raw (xfont, glyph, ink_rect, logical_rect);