aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-18 15:40:55 (GMT)
committerrathnor <rathnor>2003-07-18 15:40:55 (GMT)
commit7e1733c4352befe577150bad63d362dd7c1a94b9 (patch)
tree1f339ae234f85aaa98529e9c511117dcb620a9f1 /src/Toolbar.cc
parent06d723aefe7fb794f50b1e7a0ad8ad4473ae8ac6 (diff)
downloadfluxbox_pavel-7e1733c4352befe577150bad63d362dd7c1a94b9.zip
fluxbox_pavel-7e1733c4352befe577150bad63d362dd7c1a94b9.tar.bz2
reorganise operation of ResourceManager
plus fix initialisation of layer for slit and toolbar
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index fca4666..e0f4424 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.100 2003/07/10 15:52:58 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.101 2003/07/18 15:40:55 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -262,7 +262,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
262 m_themelistener(*this), 262 m_themelistener(*this),
263 m_layeritem(frame.window, layer), 263 m_layeritem(frame.window, layer),
264 m_strut(0), 264 m_strut(0),
265 m_rc_auto_hide(scrn.resourceManager(), false, 265 // lock rcmanager here
266 m_rc_auto_hide(scrn.resourceManager().lock(), false,
266 scrn.name() + ".toolbar.autoHide", scrn.altName() + ".Toolbar.AutoHide"), 267 scrn.name() + ".toolbar.autoHide", scrn.altName() + ".Toolbar.AutoHide"),
267 m_rc_maximize_over(scrn.resourceManager(), false, 268 m_rc_maximize_over(scrn.resourceManager(), false,
268 scrn.name() + ".toolbar.maxOver", scrn.altName() + ".Toolbar.MaxOver"), 269 scrn.name() + ".toolbar.maxOver", scrn.altName() + ".Toolbar.MaxOver"),
@@ -281,6 +282,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
281 // listen to screen reconfigure 282 // listen to screen reconfigure
282 screen().reconfigureSig().attach(&m_themelistener); 283 screen().reconfigureSig().attach(&m_themelistener);
283 284
285 moveToLayer((*m_rc_layernum).getNum());
286
284 m_layermenu.setInternalMenu(); 287 m_layermenu.setInternalMenu();
285 m_placementmenu.setInternalMenu(); 288 m_placementmenu.setInternalMenu();
286 setupMenus(); 289 setupMenus();
@@ -330,6 +333,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
330 reconfigure(); // get everything together 333 reconfigure(); // get everything together
331 frame.window.showSubwindows(); 334 frame.window.showSubwindows();
332 frame.window.show(); 335 frame.window.show();
336
337 scrn.resourceManager().unlock();
333} 338}
334 339
335 340