1 files changed, 29 insertions, 3 deletions

diff --git a/src/ButtonTheme.cc b/src/ButtonTheme.cc
index abd8c24..f3bed1f 100644
--- a/src/ButtonTheme.cc
+++ b/src/ButtonTheme.cc
@@ -4,12 +4,16 @@
 //!! TODO: still missing *.pressed.picColor
 ButtonTheme::ButtonTheme(int screen_num, 
                          const std::string &name, 
-                         const std::string &alt_name):
+                         const std::string &alt_name,
+                         const std::string &extra_fallback,
+                         const std::string &extra_fallback_alt):
     ToolTheme(screen_num, name, alt_name),
     m_pic_color(*this, name + ".picColor", alt_name + ".PicColor"),
     m_pressed_texture(*this, name + ".pressed", alt_name + ".Pressed"),
     m_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
-    m_scale(*this, name + ".scale", alt_name + ".Scale") {
+    m_scale(*this, name + ".scale", alt_name + ".Scale"),
+    m_name(name),
+    m_fallbackname(extra_fallback), m_altfallbackname(extra_fallback_alt) {
 
 }
 
@@ -24,9 +28,31 @@ bool ButtonTheme::fallback(FbTk::ThemeItem_base &item) {
         return FbTk::ThemeManager::instance().loadItem(item, "borderColor", "BorderColor");
     }
 */
-    if (item.name().find(".pressed") != std::string::npos) {
+    if (item.name() == name()) {
+        // default to the toolbar label style
+        return FbTk::ThemeManager::instance().loadItem(item, 
+                                                       m_fallbackname,
+                                                       m_altfallbackname);
+
+    } else if (item.name().find(".picColor") != std::string::npos) {
+        // if we've fallen back to alternate name, and it doesn't have a picColor, 
+        // try its text color instead
+        return FbTk::ThemeManager::instance().loadItem(item, 
+                                                       m_fallbackname + ".picColor",
+                                                       m_altfallbackname + ".picColor") ||
+            FbTk::ThemeManager::instance().loadItem(item, 
+                                                    m_fallbackname + ".textColor",
+                                                    m_altfallbackname + ".TextColor");
+    } else if (item.name().find(".pressed") != std::string::npos) {
         // copy texture
         *m_pressed_texture = texture();
+        // invert the bevel if it has one!
+        unsigned long type = m_pressed_texture->type();
+        unsigned long bevels = (FbTk::Texture::SUNKEN | FbTk::Texture::RAISED);
+        if ((type & bevels) != 0) {
+            type ^= bevels;
+            m_pressed_texture->setType(type);
+        }
         return true;
     }