Attach a modifiedSig handler to the session.styleFile resource

1 files changed, 5 insertions, 3 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index d7907be..16706b7 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -328,6 +328,7 @@ Fluxbox::Fluxbox(int argc, char **argv,
 #endif // HAVE_RANDR
 
     join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent);
+    join(m_rc_stylefile.modifiedSig(), MemFunIgnoreArgs(*this, &Fluxbox::styleChanged));
 
     load_rc();
 
@@ -349,9 +350,6 @@ Fluxbox::Fluxbox(int argc, char **argv,
 #endif // HAVE_GETPID
 
 
-    // setup theme manager to have our style file ready to be scanned
-    FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());
-
     // Create keybindings handler and load keys file
     // Note: this needs to be done before creating screens
     m_key.reset(new Keys);
@@ -1002,6 +1000,10 @@ void Fluxbox::windowLayerChanged(FluxboxWindow &win) {
         CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win));
 }
 
+void Fluxbox::styleChanged() {
+    FbTk::ThemeManager::instance().load(*getStyleResource(), getStyleOverlayFilename());
+}
+
 void Fluxbox::attachSignals(FluxboxWindow &win) {
     join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged));
     join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged));