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

use a BPen in the BFont class for drawing standard X fonts

Browse source
This commit is contained in:
Dana Jansens 2002-07-09 06:50:01 +00:00
parent 0c04fb5260
commit 235d9e4c40
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Font.cc
View file

@ -275,22 +275,16 @@ void BFont::drawString(Drawable d, int x, int y, const BColor &color,
} }
#endif // XFT #endif // XFT
BGCCache *_cache = color.display()->gcCache(); BPen pen(color, _font);
BGCCacheItem *_item = _cache->find(color, _font, GXcopy, ClipByChildren);
assert(_cache);
assert(_item);
if (i18n.multibyte()) if (i18n.multibyte())
XmbDrawString(_display, d, _fontset, _item->gc(), XmbDrawString(_display, d, _fontset, pen.gc(),
x, y - _fontset_extents->max_ink_extent.y, x, y - _fontset_extents->max_ink_extent.y,
string.c_str(), string.size()); string.c_str(), string.size());
else else
XDrawString(_display, d, _item->gc(), XDrawString(_display, d, pen.gc(),
x, _font->ascent + y, x, _font->ascent + y,
string.c_str(), string.size()); string.c_str(), string.size());
_cache->release(_item);
} }