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

Cosmetic

Browse source
This commit is contained in:
Mathias Gumz 2015-01-23 15:17:02 +01:00
parent 73858632f3
commit 0d8a3dfb6b
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/IconbarTheme.cc
View file

@ -64,15 +64,13 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
|| tm.loadItem(item, "toolbar", "toolbar"));
} else if (item.name() == m_name + ".borderWidth")
// don't fallback for base border, for theme backwards compatibility
return (tm.loadItem(item, base + ".borderWidth",
altbase + ".BorderWidth") ||
return (tm.loadItem(item, base + ".borderWidth", altbase + ".BorderWidth") ||
tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
tm.loadItem(item, "borderWidth", "BorderWidth"));
else if (item.name() == m_name + ".borderColor")
return (tm.loadItem(item, base + ".borderColor",
altbase + ".BorderColor") ||
return (tm.loadItem(item, base + ".borderColor", altbase + ".BorderColor") ||
tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
tm.loadItem(item, "borderColor", "BorderColor"));

7
src/WindowState.cc
View file

@ -23,13 +23,8 @@
#include "FbTk/StringUtil.hh"
#ifdef HAVE_CSTDLIB
#include <cstdlib>
#else
#include <stdlib.h>
#endif
#include <errno.h>
#include <cerrno>
bool WindowState::useBorder() const {
return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;