Changed current workspace signal in BScreen to use the new signal system

1 files changed, 9 insertions, 2 deletions

diff --git a/src/WorkspaceNameTool.cc b/src/WorkspaceNameTool.cc
index 6c73df5..b6afad8 100644
--- a/src/WorkspaceNameTool.cc
+++ b/src/WorkspaceNameTool.cc
@@ -27,6 +27,7 @@
 #include "Workspace.hh"
 
 #include "FbTk/ImageControl.hh"
+#include "FbTk/MemFun.hh"
 
 #include <algorithm>
 
@@ -43,7 +44,10 @@ WorkspaceNameTool::WorkspaceNameTool(const FbTk::FbWindow &parent,
 
     // setup signals
     screen.workspaceNamesSig().attach(this);
-    screen.currentWorkspaceSig().attach(this);
+
+    join(screen.currentWorkspaceSig(),
+         FbTk::MemFun(*this, &WorkspaceNameTool::updateForScreen));
+
     theme.reconfigSig().attach(this);
 }
 
@@ -67,8 +71,11 @@ void WorkspaceNameTool::moveResize(int x, int y,
 }
 
 void WorkspaceNameTool::update(FbTk::Subject *subj) {
+    updateForScreen(m_screen);
+}
 
-    m_button.setText(m_screen.currentWorkspace()->name());
+void WorkspaceNameTool::updateForScreen(BScreen &screen) {
+    m_button.setText(screen.currentWorkspace()->name());
     if (m_button.width() != width()) {
         resize(width(), height());
         resizeSig().notify();