X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=a41614051dc3c5e0974645927d32e87a84f99c0a;hb=fd0b9f760ab69c9e78f522ad0a9fe5d41152a382;hp=cb29165e7a2d1eded2d4aeab94ceb2a80868231e;hpb=740c5b2a20d5110435d0874f8cc6a4c9dfd14777;p=chaz%2Fopenbox 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);