From 8f9aae0cc29d91dd9b4e3d3639ed3d58a7aa923b Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 15 Jul 2005 14:39:31 +0000 Subject: fix the dpi stuff with pango by reading the right ascent and descent stuff --- render/render.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'render/render.c') diff --git a/render/render.c b/render/render.c index cb29165e..a4161405 100644 --- a/render/render.c +++ b/render/render.c @@ -311,7 +311,7 @@ void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b) void RrMinsize(RrAppearance *a, gint *w, gint *h) { gint i; - gint m; + RrSize *m; gint l, t, r, b; *w = *h = 0; @@ -326,9 +326,9 @@ void RrMinsize(RrAppearance *a, gint *w, gint *h) case RR_TEXTURE_TEXT: m = RrFontMeasureString(a->texture[i].data.text.font, a->texture[i].data.text.string); - *w = MAX(*w, m); - m = RrFontHeight(a->texture[i].data.text.font); - *h += MAX(*h, m); + *w = MAX(*w, m->width + 4); + m->height = RrFontHeight(a->texture[i].data.text.font); + *h += MAX(*h, m->height); break; case RR_TEXTURE_RGBA: *w += MAX(*w, a->texture[i].data.rgba.width); -- cgit v1.2.3