rename fieron to not have a cap letter

[chaz/openbox] / src / Font.cc

diff --git a/src/Font.cc b/src/Font.cc
index 37dfef2f878f8e94bf1047bd48bce5f52479baf0..68114a989c237972c4c0d7ba4d96f5d47d3a8382 100644 (file)
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -262,33 +262,26 @@ void BFont::drawString(Drawable d, int x, int y, const BColor &color,
                                   _screen->getColormap());
     assert(draw);
 
-/*    if (_shadow) {
+    if (_shadow) {
       XftColor c;
       c.color.red = 0;
       c.color.green = 0;
       c.color.blue = 0;
-      c.color.alpha = 0x49 | 0x49 << 8; // transparent shadow
+      c.color.alpha = 0x40 | 0x40 << 8; // transparent shadow
       c.pixel = BlackPixel(_display, _screen->getScreenNumber());
 
         
       XftDrawStringUtf8(draw, &c, _xftfont, x + 1, _xftfont->ascent + y + 1,
                         (XftChar8 *) string.c_str(), string.size());
     }
-*/
-
+    
     XftColor c;
     c.color.red = color.red() | color.red() << 8;
     c.color.green = color.green() | color.green() << 8;
     c.color.blue = color.blue() | color.blue() << 8;
     c.pixel = color.pixel();
-
-    if (_shadow) {
-      c.color.alpha = 0x66 | 0x66 << 8; // transparent shadow
-      XftDrawStringUtf8(draw, &c, _xftfont, x + 1, _xftfont->ascent + y + 1,
-                        (XftChar8 *) string.c_str(), string.size());
-    }
-    
     c.color.alpha = 0xff | 0xff << 8; // no transparency in BColor yet
+
     XftDrawStringUtf8(draw, &c, _xftfont, x, _xftfont->ascent + y,
                       (XftChar8 *) string.c_str(), string.size());
 
@@ -318,7 +311,7 @@ unsigned int BFont::measureString(const string &string) const {
     XGlyphInfo info;
     XftTextExtentsUtf8(_display, _xftfont, (XftChar8 *) string.c_str(),
                        string.size(), &info);
-    return info.xOff;
+    return info.xOff + (_shadow ? 1 : 0);
   }
 #endif // XFT
 
@@ -337,7 +330,7 @@ unsigned int BFont::height(void) const {
 
 #ifdef    XFT
   if (_xftfont)
-    return _xftfont->height;
+    return _xftfont->height + (_shadow ? 1 : 0);
 #endif // XFT
 
   if (i18n.multibyte())