diff options
author | rathnor <rathnor> | 2003-05-24 05:49:31 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-05-24 05:49:31 (GMT) |
commit | 270cbb65922487faded4b8997bd8cd4f57a2dc95 (patch) | |
tree | 4c51a29b404a0df226f3dbbf8f1f100bee307772 /src/Toolbar.cc | |
parent | 33a65073a955d850f2a9601ea1368862b36959ff (diff) | |
download | fluxbox-270cbb65922487faded4b8997bd8cd4f57a2dc95.zip fluxbox-270cbb65922487faded4b8997bd8cd4f57a2dc95.tar.bz2 |
toolbar crash (menu bug) and initialisation fixups
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index a000c99..e5b5a5a 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.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: Toolbar.cc,v 1.86 2003/05/19 15:32:47 rathnor Exp $ | 25 | // $Id: Toolbar.cc,v 1.87 2003/05/24 05:49:31 rathnor Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -279,7 +279,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi | |||
279 | this, | 279 | this, |
280 | true), | 280 | true), |
281 | m_theme(scrn.screenNumber()), | 281 | m_theme(scrn.screenNumber()), |
282 | m_place(BOTTOMCENTER), | 282 | m_place(scrn.toolbarPlacement()), |
283 | m_themelistener(*this), | 283 | m_themelistener(*this), |
284 | m_layeritem(frame.window, layer) { | 284 | m_layeritem(frame.window, layer) { |
285 | 285 | ||
@@ -332,6 +332,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi | |||
332 | frame.pwbutton.setOnClick(prevwindow); | 332 | frame.pwbutton.setOnClick(prevwindow); |
333 | frame.nwbutton.setOnClick(nextwindow); | 333 | frame.nwbutton.setOnClick(nextwindow); |
334 | 334 | ||
335 | reconfigure(); // get everything together | ||
335 | frame.window.showSubwindows(); | 336 | frame.window.showSubwindows(); |
336 | frame.window.show(); | 337 | frame.window.show(); |
337 | } | 338 | } |