use drop shadow height in the font height.

honour rc file config option for drop shadows with new shadow code

diff --git a/src/Font.cc b/src/Font.cc
index e2649f10ae3e056ac7609e233cff365ef6e37b07..ea70933acffbb1630841784d799b552de7788b02 100644 (file)
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -331,7 +331,7 @@ unsigned int BFont::measureString(const string &string) const {
                     _display, _xftfont, (XftChar8 *) string.c_str(),
                     string.size(), &info);
 
-    return info.xOff + (_shadow ? 1 : 0);
+    return info.xOff + (_shadow ? _offset : 0);
   }
 #endif // XFT
 
@@ -350,7 +350,7 @@ unsigned int BFont::height(void) const {
 
 #ifdef    XFT
   if (_xftfont)
-    return _xftfont->height + (_shadow ? 1 : 0);
+    return _xftfont->height + (_shadow ? _offset : 0);
 #endif // XFT
 
   if (i18n.multibyte())

diff --git a/src/Screen.cc b/src/Screen.cc
index f691cf6eb9ed23bbd0885cadff815417af9f6ac2..70494cab38132a0b1916f96a258f1ad7726e5d6b 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2757,7 +2757,8 @@ BFont *BScreen::readDatabaseFont(const string &rbasename,
 
     
     BFont *b = new BFont(blackbox->getXDisplay(), this, family, i, bold,
-                         italic, dropShadow, offset, tint, resource.aa_fonts);
+                         italic, dropShadow && resource.shadow_fonts, offset, 
+                         tint, resource.aa_fonts);
     if (b->valid())
       return b;
     else