aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTheme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconbarTheme.cc')
-rw-r--r--src/IconbarTheme.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc
index 0be9cd1..cead9c8 100644
--- a/src/IconbarTheme.cc
+++ b/src/IconbarTheme.cc
@@ -64,15 +64,13 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
64 || tm.loadItem(item, "toolbar", "toolbar")); 64 || tm.loadItem(item, "toolbar", "toolbar"));
65 } else if (item.name() == m_name + ".borderWidth") 65 } else if (item.name() == m_name + ".borderWidth")
66 // don't fallback for base border, for theme backwards compatibility 66 // don't fallback for base border, for theme backwards compatibility
67 return (tm.loadItem(item, base + ".borderWidth", 67 return (tm.loadItem(item, base + ".borderWidth", altbase + ".BorderWidth") ||
68 altbase + ".BorderWidth") ||
69 tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") || 68 tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
70 tm.loadItem(item, "borderWidth", "BorderWidth")); 69 tm.loadItem(item, "borderWidth", "BorderWidth"));
71 70
72 else if (item.name() == m_name + ".borderColor") 71 else if (item.name() == m_name + ".borderColor")
73 72
74 return (tm.loadItem(item, base + ".borderColor", 73 return (tm.loadItem(item, base + ".borderColor", altbase + ".BorderColor") ||
75 altbase + ".BorderColor") ||
76 tm.loadItem(item, "window.borderColor", "Window.BorderColor") || 74 tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
77 tm.loadItem(item, "borderColor", "BorderColor")); 75 tm.loadItem(item, "borderColor", "BorderColor"));
78 76