aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e735773..8541185 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -326,6 +326,7 @@ Fluxbox::Fluxbox(int argc, char **argv,
326#endif // HAVE_RANDR 326#endif // HAVE_RANDR
327 327
328 join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent); 328 join(m_rc_pseudotrans.modifiedSig(), &FbTk::Transparent::usePseudoTransparent);
329 join(m_rc_stylefile.modifiedSig(), MemFunIgnoreArgs(*this, &Fluxbox::styleChanged));
329 330
330 load_rc(); 331 load_rc();
331 332
@@ -347,9 +348,6 @@ Fluxbox::Fluxbox(int argc, char **argv,
347#endif // HAVE_GETPID 348#endif // HAVE_GETPID
348 349
349 350
350 // setup theme manager to have our style file ready to be scanned
351 FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());
352
353 // Create keybindings handler and load keys file 351 // Create keybindings handler and load keys file
354 // Note: this needs to be done before creating screens 352 // Note: this needs to be done before creating screens
355 m_key.reset(new Keys); 353 m_key.reset(new Keys);
@@ -1001,6 +999,10 @@ void Fluxbox::windowLayerChanged(FluxboxWindow &win) {
1001 CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win)); 999 CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win));
1002} 1000}
1003 1001
1002void Fluxbox::styleChanged() {
1003 FbTk::ThemeManager::instance().load(*getStyleResource(), getStyleOverlayFilename());
1004}
1005
1004void Fluxbox::attachSignals(FluxboxWindow &win) { 1006void Fluxbox::attachSignals(FluxboxWindow &win) {
1005 join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged)); 1007 join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged));
1006 join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged)); 1008 join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged));