diff options
| author | Scott Moynes <smoynes@nexus.carleton.ca> | 2002-10-17 02:59:30 +0000 |
|---|---|---|
| committer | Scott Moynes <smoynes@nexus.carleton.ca> | 2002-10-17 02:59:30 +0000 |
| commit | 8b55442b2e0893f3064e88c4372bd0ecf00ba830 (patch) | |
| tree | 5d3df4894b9a1597d62735dbf4a7e8a11c511d73 /src | |
| parent | 8552ba2ac95cf489c404df0175d4eac9cf23c3a7 (diff) | |
use drop shadow height in the font height.
honour rc file config option for drop shadows with new shadow code
Diffstat (limited to 'src')
| -rw-r--r-- | src/Font.cc | 4 | ||||
| -rw-r--r-- | src/Screen.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Font.cc b/src/Font.cc index e2649f10..ea70933a 100644 --- 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 f691cf6e..70494cab 100644 --- 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 |