nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use drop shadow height in the font height.

Browse source 
honour rc file config option for drop shadows with new shadow code
This commit is contained in:
Scott Moynes 2002-10-17 02:59:30 +00:00
parent 8552ba2ac9
commit 8b55442b2e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Font.cc
View file

@ -331,7 +331,7 @@ unsigned int BFont::measureString(const string &string) const {
_display, _xftfont, (XftChar8 *) string.c_str(), _display, _xftfont, (XftChar8 *) string.c_str(),
string.size(), &info); string.size(), &info);
return info.xOff + (_shadow ? 1 : 0); return info.xOff + (_shadow ? _offset : 0);
} }
#endif // XFT #endif // XFT
@ -350,7 +350,7 @@ unsigned int BFont::height(void) const {
#ifdef XFT #ifdef XFT
if (_xftfont) if (_xftfont)
return _xftfont->height + (_shadow ? 1 : 0); return _xftfont->height + (_shadow ? _offset : 0);
#endif // XFT #endif // XFT
if (i18n.multibyte()) if (i18n.multibyte())

3
src/Screen.cc
View file

@ -2757,7 +2757,8 @@ BFont *BScreen::readDatabaseFont(const string &rbasename,
BFont *b = new BFont(blackbox->getXDisplay(), this, family, i, bold, 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()) if (b->valid())
return b; return b;
else else