1 files changed, 10 insertions, 6 deletions

diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index f352237..6678d1d 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -243,13 +243,14 @@ private:
 
 }; // end anonymous namespace
 
-IconbarTool::IconbarTool(const FbTk::FbWindow &parent,
+IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
                          FbTk::ThemeProxy<IconbarTheme> &focused_theme,
                          FbTk::ThemeProxy<IconbarTheme> &unfocused_theme,
                          BScreen &screen, FbTk::Menu &menu):
     ToolbarItem(ToolbarItem::RELATIVE),
     m_screen(screen),
     m_icon_container(parent),
+    m_theme(theme),
     m_focused_theme(focused_theme),
     m_unfocused_theme(unfocused_theme),
     m_empty_pm( screen.imageControl() ),
@@ -290,6 +291,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent,
     menu.insert(m_menu.label(), &m_menu);
 
     // setup signals
+    theme.reconfigSig().attach(this);
     focused_theme.reconfigSig().attach(this);
     unfocused_theme.reconfigSig().attach(this);
     setMode(*m_rc_mode);
@@ -397,7 +399,8 @@ void IconbarTool::update(FbTk::Subject *subj) {
     m_icon_container.setMaxSizePerClient(*m_rc_client_width);
 
     if (subj == &m_focused_theme.reconfigSig() ||
-        subj == &m_unfocused_theme.reconfigSig()) {
+        subj == &m_unfocused_theme.reconfigSig() ||
+        subj == &m_theme.reconfigSig()) {
         setMode(*m_rc_mode);
         return;
     }
@@ -463,7 +466,8 @@ void IconbarTool::reset() {
 }
 
 void IconbarTool::updateSizing() {
-    m_icon_container.setBorderWidth(m_focused_theme->border().width());
+    m_icon_container.setBorderWidth(m_theme.border().width());
+    m_icon_container.setBorderColor(m_theme.border().color());
 
     IconMap::iterator icon_it = m_icons.begin();
     const IconMap::iterator icon_it_end = m_icons.end();
@@ -484,14 +488,14 @@ void IconbarTool::renderTheme() {
     updateSizing();
 
     // if we dont have any icons then we should render empty texture
-    if (!m_focused_theme->emptyTexture().usePixmap()) {
+    if (!m_theme.emptyTexture().usePixmap()) {
         m_empty_pm.reset( 0 );
-        m_icon_container.setBackgroundColor(m_focused_theme->emptyTexture().color());
+        m_icon_container.setBackgroundColor(m_theme.emptyTexture().color());
     } else {
         m_empty_pm.reset(m_screen.imageControl().
                           renderImage(m_icon_container.width(),
                                       m_icon_container.height(),
-                                      m_focused_theme->emptyTexture(), orientation()));
+                                      m_theme.emptyTexture(), orientation()));
         m_icon_container.setBackgroundPixmap(m_empty_pm);
     }