diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 8 |
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, | |||
328 | #endif // HAVE_RANDR | 328 | #endif // HAVE_RANDR |
329 | 329 | ||
330 | join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent); | 330 | join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent); |
331 | join(m_rc_stylefile.modifiedSig(), MemFunIgnoreArgs(*this, &Fluxbox::styleChanged)); | ||
331 | 332 | ||
332 | load_rc(); | 333 | load_rc(); |
333 | 334 | ||
@@ -349,9 +350,6 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
349 | #endif // HAVE_GETPID | 350 | #endif // HAVE_GETPID |
350 | 351 | ||
351 | 352 | ||
352 | // setup theme manager to have our style file ready to be scanned | ||
353 | FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename()); | ||
354 | |||
355 | // Create keybindings handler and load keys file | 353 | // Create keybindings handler and load keys file |
356 | // Note: this needs to be done before creating screens | 354 | // Note: this needs to be done before creating screens |
357 | m_key.reset(new Keys); | 355 | m_key.reset(new Keys); |
@@ -1002,6 +1000,10 @@ void Fluxbox::windowLayerChanged(FluxboxWindow &win) { | |||
1002 | CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win)); | 1000 | CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win)); |
1003 | } | 1001 | } |
1004 | 1002 | ||
1003 | void Fluxbox::styleChanged() { | ||
1004 | FbTk::ThemeManager::instance().load(*getStyleResource(), getStyleOverlayFilename()); | ||
1005 | } | ||
1006 | |||
1005 | void Fluxbox::attachSignals(FluxboxWindow &win) { | 1007 | void Fluxbox::attachSignals(FluxboxWindow &win) { |
1006 | join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged)); | 1008 | join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged)); |
1007 | join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged)); | 1009 | join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged)); |