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

cosmetics

Browse source
This commit is contained in:
Mathias Gumz 2013-06-22 09:45:48 +02:00
parent 34656ac622
commit 2efd4b8230
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/FbTk/Font.cc
View file

@ -91,10 +91,11 @@ typedef FontCache::iterator FontCacheIt;
void resetEffects(FbTk::Font& font) { void resetEffects(FbTk::Font& font) {
int nr_scr = DefaultScreen(FbTk::App::instance()->display());
font.setHalo(false); font.setHalo(false);
font.setHaloColor(FbTk::Color("white", DefaultScreen(FbTk::App::instance()->display()))); font.setHaloColor(FbTk::Color("white", nr_scr));
font.setShadow(false); font.setShadow(false);
font.setShadowColor(FbTk::Color("black", DefaultScreen(FbTk::App::instance()->display()))); font.setShadowColor(FbTk::Color("black", nr_scr));
font.setShadowOffY(2); font.setShadowOffY(2);
font.setShadowOffX(2); font.setShadowOffX(2);
} }

12
src/FbTk/XftFontImp.cc
View file

@ -62,12 +62,12 @@ bool XftFontImp::load(const std::string &name) {
if (newxftfont == 0) if (newxftfont == 0)
return false; return false;
} }
// destroy all old fonts and set new // destroy all old fonts and set new
for (int r = ROT0; r <= ROT270; r++) { for (int r = ROT0; r <= ROT270; r++) {
m_xftfonts_loaded[r] = false; m_xftfonts_loaded[r] = false;
if (m_xftfonts[r] != 0) { if (m_xftfonts[r] != 0) {
XftFontClose(App::instance()->display(), m_xftfonts[r]); XftFontClose(disp, m_xftfonts[r]);
m_xftfonts[r] = 0; m_xftfonts[r] = 0;
} }
} }
@ -176,12 +176,10 @@ unsigned int XftFontImp::textWidth(const char* text, unsigned int len) const {
#ifdef HAVE_XFT_UTF8_STRING #ifdef HAVE_XFT_UTF8_STRING
if (m_utf8mode) { if (m_utf8mode) {
XftTextExtentsUtf8(disp, XftTextExtentsUtf8(disp, font, (XftChar8 *)text, len, &ginfo);
font, if (ginfo.xOff != 0) {
(XftChar8 *)text, len,
&ginfo);
if (ginfo.xOff != 0)
return ginfo.xOff; return ginfo.xOff;
}
// the utf8 failed, try normal extents // the utf8 failed, try normal extents
} }