nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reconfigure toolbar after we load resources

Browse source
This commit is contained in:
fluxgen 2003-06-23 13:31:47 +00:00
parent 150db600ff
commit 3029aca7ef
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.188 2003/06/23 13:10:52 fluxgen Exp $ // $Id: Screen.cc,v 1.189 2003/06/23 13:31:47 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -461,15 +461,17 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
#ifdef SLIT #ifdef SLIT
m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()),
Fluxbox::instance()->getSlitlistFilename().c_str())); Fluxbox::instance()->getSlitlistFilename().c_str()));
//!! TODO: we shouldn't do this more than once, but since slit handles it's own resources
// we must do this.
fluxbox->load_rc(*this);
#endif // SLIT #endif // SLIT
// create toolbarhandler for toolbar // create toolbarhandler for toolbar
m_toolbarhandler.reset(new ToolbarHandler(*this, toolbarMode())); m_toolbarhandler.reset(new ToolbarHandler(*this, toolbarMode()));
//!! TODO: we shouldn't do this more than once, but since slit/toolbar handles their
// own resources we must do this.
fluxbox->load_rc(*this);
m_configmenu.reset(createMenuFromScreen(*this)); m_configmenu.reset(createMenuFromScreen(*this));
setupConfigmenu(*m_configmenu.get()); setupConfigmenu(*m_configmenu.get());
m_configmenu->setInternalMenu(); m_configmenu->setInternalMenu();
@ -486,9 +488,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
m_configmenu->update(); m_configmenu->update();
#ifdef SLIT #ifdef SLIT
if (m_slit.get()) if (slit())
m_slit->reconfigure(); slit()->reconfigure();
#endif // SLIT #endif // SLIT
if (toolbar())
toolbar()->reconfigure();
// start with workspace 0 // start with workspace 0
changeWorkspaceID(0); changeWorkspaceID(0);