use drop shadow height in the font height.
honour rc file config option for drop shadows with new shadow code
This commit is contained in:
parent
8552ba2ac9
commit
8b55442b2e
2 changed files with 4 additions and 3 deletions
|
@ -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())
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue