summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-07-26 19:59:35 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-07-26 19:59:35 +0000
commitc05f7d0df196b68dc133e9d56e6d690c9a1e5ca8 (patch)
tree51ff16de5629da2a2138c5dc415a95dd53e29ea4 /pango
parent6c4fc6de9418e54c9d8d2c7ad4d9430524456edf (diff)
downloadpango-c05f7d0df196b68dc133e9d56e6d690c9a1e5ca8.tar.gz
mini_width/height are still (before render patch) in pixels, not Pango
Mon Jul 26 15:55:03 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (get_glyph_extents_missing): mini_width/height are still (before render patch) in pixels, not Pango units.
Diffstat (limited to 'pango')
-rw-r--r--pango/pangoxft-font.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index bff2c305..d7c6bf3a 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -432,16 +432,16 @@ get_glyph_extents_missing (PangoXftFont *xfont,
if (ink_rect)
{
ink_rect->x = 0;
- ink_rect->y = - PANGO_SCALE * xft_font->ascent + (PANGO_SCALE * (xft_font->ascent) + xft_font->descent - xfont->mini_height * 2 - xfont->mini_pad * 5) / 2;
- ink_rect->width = xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 1);
- ink_rect->height = xfont->mini_height * 2 + xfont->mini_pad * 5;
+ ink_rect->y = PANGO_SCALE * (- xft_font->ascent + (xft_font->ascent + xft_font->descent - xfont->mini_height * 2 - xfont->mini_pad * 5) / 2);
+ ink_rect->width = PANGO_SCALE * (xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 1));
+ ink_rect->height = PANGO_SCALE * (xfont->mini_height * 2 + xfont->mini_pad * 5);
}
if (logical_rect)
{
logical_rect->x = 0;
logical_rect->y = - PANGO_SCALE * xft_font->ascent;
- logical_rect->width = xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 2);
+ logical_rect->width = PANGO_SCALE * (xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 2));
logical_rect->height = (xft_font->ascent + xft_font->descent) * PANGO_SCALE;
}
}