aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTheme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconbarTheme.cc')
-rw-r--r--src/IconbarTheme.cc28
1 files changed, 10 insertions, 18 deletions
diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc
index 69e0a7b..9710dfc 100644
--- a/src/IconbarTheme.cc
+++ b/src/IconbarTheme.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconbarTheme.cc,v 1.8 2004/01/13 14:41:32 rathnor Exp $ 23// $Id: IconbarTheme.cc,v 1.9 2004/04/26 15:04:36 rathnor Exp $
24 24
25#include "IconbarTheme.hh" 25#include "IconbarTheme.hh"
26#include "FbTk/App.hh" 26#include "FbTk/App.hh"
@@ -64,25 +64,17 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
64 ThemeManager &tm = ThemeManager::instance(); 64 ThemeManager &tm = ThemeManager::instance();
65 65
66 if (&m_focused_texture == &item) { 66 if (&m_focused_texture == &item) {
67 // special case for textures since they're using .load() 67 return (tm.loadItem(item, "window.label.focus", "Window.Label.Focus") ||
68 FbTk::ThemeItem<FbTk::Texture> tmp_item(m_focused_texture.theme(), 68 tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel"));
69 "window.label.focus", "Window.Title.Focus"); 69
70 tmp_item.load();
71 // copy texture
72 *m_focused_texture = *tmp_item;
73 return true;
74 } else if (&m_unfocused_texture == &item) { 70 } else if (&m_unfocused_texture == &item) {
75 // special case for textures since they're using .load() 71 return (tm.loadItem(item, "window.label.unfocus", "Window.Label.Unfocus") ||
76 FbTk::ThemeItem<FbTk::Texture> tmp_item(m_unfocused_texture.theme(),
77 "window.label.unfocus", "Window.Label.Unfocus");
78 tmp_item.load();
79 // copy texture
80 *m_unfocused_texture = *tmp_item;
81 return true;
82 } else if (&m_empty_texture == &item) {
83 return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ?
84 true :
85 tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel")); 72 tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel"));
73 } else if (&m_empty_texture == &item) {
74 return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ||
75 tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel") ||
76 tm.loadItem(item, "toolbar", "toolbar")
77 );
86 } else if (item.name() == m_name + ".borderWidth" || 78 } else if (item.name() == m_name + ".borderWidth" ||
87 item.name() == m_name + ".focused.borderWidth" || 79 item.name() == m_name + ".focused.borderWidth" ||
88 item.name() == m_name + ".unfocused.borderWidth") 80 item.name() == m_name + ".unfocused.borderWidth")