aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 3d26810..7337b9f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.188 2003/06/23 13:10:52 fluxgen Exp $ 25// $Id: Screen.cc,v 1.189 2003/06/23 13:31:47 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -461,15 +461,17 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
461#ifdef SLIT 461#ifdef SLIT
462 m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), 462 m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()),
463 Fluxbox::instance()->getSlitlistFilename().c_str())); 463 Fluxbox::instance()->getSlitlistFilename().c_str()));
464 //!! TODO: we shouldn't do this more than once, but since slit handles it's own resources 464
465 // we must do this.
466 fluxbox->load_rc(*this);
467#endif // SLIT 465#endif // SLIT
468 466
469 // create toolbarhandler for toolbar 467 // create toolbarhandler for toolbar
470 468
471 m_toolbarhandler.reset(new ToolbarHandler(*this, toolbarMode())); 469 m_toolbarhandler.reset(new ToolbarHandler(*this, toolbarMode()));
472 470
471 //!! TODO: we shouldn't do this more than once, but since slit/toolbar handles their
472 // own resources we must do this.
473 fluxbox->load_rc(*this);
474
473 m_configmenu.reset(createMenuFromScreen(*this)); 475 m_configmenu.reset(createMenuFromScreen(*this));
474 setupConfigmenu(*m_configmenu.get()); 476 setupConfigmenu(*m_configmenu.get());
475 m_configmenu->setInternalMenu(); 477 m_configmenu->setInternalMenu();
@@ -486,9 +488,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
486 m_configmenu->update(); 488 m_configmenu->update();
487 489
488#ifdef SLIT 490#ifdef SLIT
489 if (m_slit.get()) 491 if (slit())
490 m_slit->reconfigure(); 492 slit()->reconfigure();
491#endif // SLIT 493#endif // SLIT
494 if (toolbar())
495 toolbar()->reconfigure();
492 496
493 // start with workspace 0 497 // start with workspace 0
494 changeWorkspaceID(0); 498 changeWorkspaceID(0);