summaryrefslogtreecommitdiff
path: root/src/FbWinFrameTheme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbWinFrameTheme.cc')
-rw-r--r--src/FbWinFrameTheme.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 1175297..624c242 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -51,7 +51,8 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
51 m_title_height(*this, "window.title.height", "Window.Title.Height"), 51 m_title_height(*this, "window.title.height", "Window.Title.Height"),
52 m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"), 52 m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"),
53 m_handle_width(*this, "window.handleWidth", "Window.handleWidth"), 53 m_handle_width(*this, "window.handleWidth", "Window.handleWidth"),
54 m_border(*this, "window", "Window"), // for window.border* 54 m_border_focus(*this, "window.focus", "Window.Focus"),
55 m_border_unfocus(*this, "window.unfocus", "Window.Unfocus"),
55 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 56 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
56 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 57 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
57 m_focused_alpha(255), 58 m_focused_alpha(255),
@@ -83,10 +84,13 @@ FbWinFrameTheme::~FbWinFrameTheme() {
83} 84}
84 85
85bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) { 86bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) {
86 if (item.name() == "window.borderWidth") 87 if (item.name() == "window.focus.borderWidth" ||
87 return FbTk::ThemeManager::instance().loadItem(item, "borderWidth", "BorderWidth"); 88 item.name() == "window.unfocus.borderWidth")
88 else if (item.name() == "window.borderColor") 89 return FbTk::ThemeManager::instance().loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
89 return FbTk::ThemeManager::instance().loadItem(item, "borderColor", "BorderColor"); 90 FbTk::ThemeManager::instance().loadItem(item, "borderWidth", "BorderWidth");
91 else if (item.name() == "window.focus.borderColor" || item.name() == "window.unfocus.borderColor")
92 return FbTk::ThemeManager::instance().loadItem(item, "window.borderColor", "Window.BorderColor") ||
93 FbTk::ThemeManager::instance().loadItem(item, "borderColor", "BorderColor");
90 else if (item.name() == "window.bevelWidth") 94 else if (item.name() == "window.bevelWidth")
91 return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth"); 95 return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth");
92 else if (item.name() == "window.handleWidth") 96 else if (item.name() == "window.handleWidth")