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 37eb0e1..22dfbe3 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -331,6 +331,7 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
331 | #endif // HAVE_RANDR | 331 | #endif // HAVE_RANDR |
332 | 332 | ||
333 | join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent); | 333 | join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent); |
334 | join(m_rc_stylefile.modifiedSig(), MemFunIgnoreArgs(*this, &Fluxbox::styleChanged)); | ||
334 | 335 | ||
335 | load_rc(); | 336 | load_rc(); |
336 | grab(); | 337 | grab(); |
@@ -351,9 +352,6 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
351 | #endif // HAVE_GETPID | 352 | #endif // HAVE_GETPID |
352 | 353 | ||
353 | 354 | ||
354 | // setup theme manager to have our style file ready to be scanned | ||
355 | FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename()); | ||
356 | |||
357 | // Create keybindings handler and load keys file | 355 | // Create keybindings handler and load keys file |
358 | // Note: this needs to be done before creating screens | 356 | // Note: this needs to be done before creating screens |
359 | m_key.reset(new Keys); | 357 | m_key.reset(new Keys); |
@@ -1010,6 +1008,10 @@ void Fluxbox::windowLayerChanged(FluxboxWindow &win) { | |||
1010 | CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win)); | 1008 | CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win)); |
1011 | } | 1009 | } |
1012 | 1010 | ||
1011 | void Fluxbox::styleChanged() { | ||
1012 | FbTk::ThemeManager::instance().load(*getStyleResource(), getStyleOverlayFilename()); | ||
1013 | } | ||
1014 | |||
1013 | void Fluxbox::attachSignals(FluxboxWindow &win) { | 1015 | void Fluxbox::attachSignals(FluxboxWindow &win) { |
1014 | join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged)); | 1016 | join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged)); |
1015 | join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged)); | 1017 | join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged)); |