Cosmetic
This commit is contained in:
parent
73858632f3
commit
0d8a3dfb6b
3 changed files with 5 additions and 12 deletions
|
@ -64,15 +64,13 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
|
||||||
|| tm.loadItem(item, "toolbar", "toolbar"));
|
|| tm.loadItem(item, "toolbar", "toolbar"));
|
||||||
} else if (item.name() == m_name + ".borderWidth")
|
} else if (item.name() == m_name + ".borderWidth")
|
||||||
// don't fallback for base border, for theme backwards compatibility
|
// don't fallback for base border, for theme backwards compatibility
|
||||||
return (tm.loadItem(item, base + ".borderWidth",
|
return (tm.loadItem(item, base + ".borderWidth", altbase + ".BorderWidth") ||
|
||||||
altbase + ".BorderWidth") ||
|
|
||||||
tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
|
tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
|
||||||
tm.loadItem(item, "borderWidth", "BorderWidth"));
|
tm.loadItem(item, "borderWidth", "BorderWidth"));
|
||||||
|
|
||||||
else if (item.name() == m_name + ".borderColor")
|
else if (item.name() == m_name + ".borderColor")
|
||||||
|
|
||||||
return (tm.loadItem(item, base + ".borderColor",
|
return (tm.loadItem(item, base + ".borderColor", altbase + ".BorderColor") ||
|
||||||
altbase + ".BorderColor") ||
|
|
||||||
tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
|
tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
|
||||||
tm.loadItem(item, "borderColor", "BorderColor"));
|
tm.loadItem(item, "borderColor", "BorderColor"));
|
||||||
|
|
||||||
|
|
|
@ -23,13 +23,8 @@
|
||||||
|
|
||||||
#include "FbTk/StringUtil.hh"
|
#include "FbTk/StringUtil.hh"
|
||||||
|
|
||||||
#ifdef HAVE_CSTDLIB
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#else
|
#include <cerrno>
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
bool WindowState::useBorder() const {
|
bool WindowState::useBorder() const {
|
||||||
return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;
|
return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;
|
||||||
|
|
Loading…
Reference in a new issue