X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=4436cf8430fb0b732e5fdb140221ef4e8a7d74cd;hb=bdf1662af23289fd5674252f6caaf63728a186c5;hp=d9bc4987bef84a2a441bdd891f8c580f0d2cc030;hpb=ff97498e1d466fa0f4de04252c8324a5a94c7e38;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index d9bc4987..4436cf84 100644
--- a/render/font.c
+++ b/render/font.c
@@ -62,7 +62,7 @@ ObFont *font_open(char *fontstring)
     g_warning(_("Unable to load font: %s\n"), "fixed");
     g_warning(_("Aborting!.\n"));
 
-    exit(3); // can't continue without a font
+    exit(3); /* can't continue without a font */
 }
 
 void font_close(ObFont *f)
@@ -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)) / 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;
 }