translate "Control" and "Shift" for modifiers too

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index c2e97861432650f3eadb8af530dc188e11108edc..d783d9d6000efafb9abc95f0b3f5db559e98cd0c 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 += (t->font->xftfont->height + 1 - (t->font->height + h)) / 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 */