diff options
author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-01-15 09:56:25 (GMT) |
---|---|---|
committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-01-15 09:56:25 (GMT) |
commit | 8c2cee577a744870fd497f73a21c2d4e1c45c907 (patch) | |
tree | 422d0ce0238fd3927f127844f552d6937719e079 /src/Screen.cc | |
parent | f6c292a406f183a12b2e327716aad5de4c0abcca (diff) | |
download | fluxbox-8c2cee577a744870fd497f73a21c2d4e1c45c907.zip fluxbox-8c2cee577a744870fd497f73a21c2d4e1c45c907.tar.bz2 |
must initialize toolbar before the windows
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 578b0c7..6af65a9 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -629,6 +629,12 @@ bool BScreen::isRestart() { | |||
629 | } | 629 | } |
630 | 630 | ||
631 | void BScreen::initWindows() { | 631 | void BScreen::initWindows() { |
632 | |||
633 | #ifdef USE_TOOLBAR | ||
634 | m_toolbar.reset(new Toolbar(*this, | ||
635 | *layerManager().getLayer(::Layer::NORMAL))); | ||
636 | #endif // USE_TOOLBAR | ||
637 | |||
632 | unsigned int nchild; | 638 | unsigned int nchild; |
633 | Window r, p, *children; | 639 | Window r, p, *children; |
634 | Display *disp = FbTk::App::instance()->display(); | 640 | Display *disp = FbTk::App::instance()->display(); |
@@ -726,11 +732,6 @@ void BScreen::initWindows() { | |||
726 | slit()->show(); | 732 | slit()->show(); |
727 | #endif // SLIT | 733 | #endif // SLIT |
728 | 734 | ||
729 | #ifdef USE_TOOLBAR | ||
730 | m_toolbar.reset(new Toolbar(*this, | ||
731 | *layerManager().getLayer(::Layer::NORMAL))); | ||
732 | #endif // USE_TOOLBAR | ||
733 | |||
734 | } | 735 | } |
735 | 736 | ||
736 | unsigned int BScreen::currentWorkspaceID() const { | 737 | unsigned int BScreen::currentWorkspaceID() const { |