From 73a3c979b39ae0b51298d16bc5e76b61d31c89d5 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 16 Apr 2002 23:50:53 +0000
Subject: Slit loads its own settings and saves them as they are changed added
 an assert in Resource

---
 src/Screen.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/Screen.cc')

diff --git a/src/Screen.cc b/src/Screen.cc
index 08c2d9ee..7a3b9d7b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -185,7 +185,9 @@ static const char *getFontSize(const char *pattern, int *size) {
 }
 
 
-BScreen::BScreen(Openbox &ob, int scrn) : ScreenInfo(ob, scrn), openbox(ob) {
+BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn),
+  openbox(ob), config(conf)
+{
   event_mask = ColormapChangeMask | EnterWindowMask | PropertyChangeMask |
 	       SubstructureRedirectMask | KeyPressMask | KeyReleaseMask |
 	       ButtonPressMask | ButtonReleaseMask;
@@ -419,7 +421,7 @@ BScreen::BScreen(Openbox &ob, int scrn) : ScreenInfo(ob, scrn), openbox(ob) {
   toolbar = new Toolbar(*this);
 
 #ifdef    SLIT
-  slit = new Slit(*this);
+  slit = new Slit(*this, config);
 #endif // SLIT
 
   InitMenu();
@@ -1545,7 +1547,7 @@ void BScreen::raiseWindows(Window *workspace_stack, int num) {
     *(session_stack + i++) = toolbar->getWindowID();
 
 #ifdef    SLIT
-  if (slit->isOnTop())
+  if (slit->onTop())
     *(session_stack + i++) = slit->getWindowID();
 #endif // SLIT
 
-- 
cgit v1.2.3