X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=d783d9d6000efafb9abc95f0b3f5db559e98cd0c;hb=930891f119321043d2a6172975d7b9c8568145f9;hp=405cf1c395c9dcf22cda9878a6885dd54e8ab2bd;hpb=0a69cfc6d2cf672634e95d5eb2015434dd924abc;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 405cf1c3..d783d9d6 100644
--- a/render/font.c
+++ b/render/font.c
@@ -96,7 +96,8 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
     XftColor c;
 
     /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
-    y += (h - t->font->xftfont->height) / 2;
+    y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
+          (t->font->height + h) - 1) / 2;
 
     x += 3; /* XXX figure out X with justification */
 
@@ -118,8 +119,7 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
     c.pixel = t->color->pixel;
                      
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
-                      t->font->xftfont->ascent + y -
-                      (t->font->xftfont->height - t->font->height) / 2,
-                     (FcChar8*)t->string, strlen(t->string));
+                      t->font->xftfont->ascent + y,
+                      (FcChar8*)t->string, strlen(t->string));
     return;
 }