make history placement optional

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index 405cf1c395c9dcf22cda9878a6885dd54e8ab2bd..4436cf8430fb0b732e5fdb140221ef4e8a7d74cd 100644 (file)
--- 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)) / 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;
 }