merged changes from pre-devel

1 files changed, 22 insertions, 15 deletions

diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc
index f4e4c55..2ee8360 100644
--- a/src/IconbarTheme.cc
+++ b/src/IconbarTheme.cc
@@ -37,8 +37,7 @@ IconbarTheme::IconbarTheme(int screen_num,
     m_border(*this, name, altname),
     m_focused_text(*this, name + ".focused", altname + ".Focused"),
     m_unfocused_text(*this, name + ".unfocused", altname + ".Unfocused"),
-    m_name(name),
-    m_alpha(*this, name+".alpha", altname+".Alpha") {
+    m_name(name), m_altname(altname) {
 
     FbTk::ThemeManager::instance().loadTheme(*this);
 
@@ -58,27 +57,36 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
     using namespace FbTk;
     ThemeManager &tm = ThemeManager::instance();
 
+    // TODO: fix fallbacks for "focused" vs. "focus"
     if (&m_focused_texture == &item) {
         return (tm.loadItem(item, "window.label.focus", "Window.Label.Focus") ||
                 tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel"));
 
     } else if (&m_unfocused_texture == &item) {
-        return (tm.loadItem(item, "window.label.unfocus", "Window.Label.Unfocus") ||
-                tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel"));
+        return (tm.loadItem(item, "window.label.unfocus",
+                "Window.Label.Unfocus") ||
+                tm.loadItem(item, "toolbar.windowLabel",
+                "toolbar.windowLabel"));
     } else if (&m_empty_texture == &item) {
-        return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) || 
-                tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel") ||
-                tm.loadItem(item, "toolbar", "toolbar")
-            ); 
+        return (tm.loadItem(item, m_focused_texture.name(),
+                m_focused_texture.altName()) ||
+                tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel")
+                || tm.loadItem(item, "toolbar", "toolbar")); 
     } else if (item.name() == m_name + ".focused.borderWidth" ||
                item.name() == m_name + ".unfocused.borderWidth")
         // don't fallback for base border, for theme backwards compatibility
-        return tm.loadItem(item, "borderWidth", "BorderWidth");
+        return (tm.loadItem(item, m_name + ".borderWidth",
+                            m_altname + ".BorderWidth") ||
+                tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
+                tm.loadItem(item, "borderWidth", "BorderWidth"));
 
     else if (item.name() == m_name + ".focused.borderColor" ||
              item.name() == m_name + ".unfocused.borderColor")
 
-        return tm.loadItem(item, "borderColor", "BorderColor");
+        return (tm.loadItem(item, m_name + ".borderColor",
+                            m_altname + ".BorderColor") ||
+                tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
+                tm.loadItem(item, "borderColor", "BorderColor"));
 
     else if (item.name() == m_name + ".focused.font" ||
              item.name() == m_name + ".unfocused.font")
@@ -91,11 +99,10 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
 
     } else if (item.name() == m_name + ".unfocused.textColor") {
         return tm.loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor");
-    } else if (item.name() == m_name + ".alpha") {
-        if (!tm.loadItem(item, "toolbar.alpha", "Toolbar.Alpha")) {
-            *m_alpha = 255;
-        }
-        return true;
+    } else if (item.name() == m_name + ".focused.justify" ||
+               item.name() == m_name + ".unfocused.justify") {
+        return (tm.loadItem(item, m_name + ".justify", m_altname + ".Justify")
+                || tm.loadItem(item, "window.justify", "Window.Justify"));
     }
  
     return false;