aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.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/Slit.cc
parent06d723aefe7fb794f50b1e7a0ad8ad4473ae8ac6 (diff)
downloadfluxbox-7e1733c4352befe577150bad63d362dd7c1a94b9.zip
fluxbox-7e1733c4352befe577150bad63d362dd7c1a94b9.tar.bz2
reorganise operation of ResourceManager
plus fix initialisation of layer for slit and toolbar
Diffstat (limited to 'src/Slit.cc')
-rw-r--r--src/Slit.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index faa8b3f..69d4824 100644
--- a/src/Slit.cc
+++ b/src/Slit.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: Slit.cc,v 1.71 2003/07/06 07:09:53 rathnor Exp $ 25// $Id: Slit.cc,v 1.72 2003/07/18 15:40:55 rathnor Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -264,8 +264,8 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
264 m_strut(0), 264 m_strut(0),
265 265
266 // resources 266 // resources
267 267 // lock in first resource
268 m_rc_auto_hide(scr.resourceManager(), false, 268 m_rc_auto_hide(scr.resourceManager().lock(), false,
269 scr.name() + ".slit.autoHide", scr.altName() + ".Slit.AutoHide"), 269 scr.name() + ".slit.autoHide", scr.altName() + ".Slit.AutoHide"),
270 // TODO: this resource name must change 270 // TODO: this resource name must change
271 m_rc_maximize_over(scr.resourceManager(), false, 271 m_rc_maximize_over(scr.resourceManager(), false,
@@ -313,12 +313,14 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
313 screen().screenNumber())); 313 screen().screenNumber()));
314 314
315 m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer)); 315 m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer));
316 moveToLayer((*m_rc_layernum).getNum());
316 317
317 // Get client list for sorting purposes 318 // Get client list for sorting purposes
318 loadClientList(filename); 319 loadClientList(filename);
319 320
320 setupMenu(); 321 setupMenu();
321 322
323 scr.resourceManager().unlock();
322} 324}
323 325
324 326