Merge emptyLayoutMod into redoLayout

This removes the emptyLayoutMod method from the LayoutModifier class, and
change the Stack parameter to redoLayout to a Maybe Stack one. It also changes
all affected code. This should should be a refactoring without any change in
program behaviour.

darcs-hash:20081005190220-23c07-4701517e3433ecff8c999da75ac582f6f1b65c19.gz

1 files changed, 3 insertions, 8 deletions

diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
index c1210b4..99a877f 100644
--- a/XMonad/Layout/NoBorders.hs
+++ b/XMonad/Layout/NoBorders.hs
@@ -75,15 +75,10 @@ data SmartBorder a = SmartBorder [a] deriving (Read, Show)
 instance LayoutModifier SmartBorder Window where
     unhook (SmartBorder s) = asks (borderWidth . config) >>= setBorders s
 
-    redoLayout sb _ st wrs = genericLayoutMod sb (W.integrate st) wrs
-
-    emptyLayoutMod sb _ wrs = genericLayoutMod sb [] wrs
- 
-genericLayoutMod :: (SmartBorder Window) -> [Window] -> [(Window, b)] -> 
-                    X ([(Window, b)], Maybe (SmartBorder Window))
-genericLayoutMod (SmartBorder s) managedwindows wrs = do
+    redoLayout (SmartBorder s) _ mst wrs = do
         wset <- gets windowset
-        let screens = filter (nonzerorect . screenRect . W.screenDetail) . W.screens $ wset
+        let managedwindows = W.integrate' mst
+            screens = filter (nonzerorect . screenRect . W.screenDetail) . W.screens $ wset
             ws = tiled ++ floating
             tiled = case filter (`elem` managedwindows) $ map fst wrs of
                 [w] | singleton screens -> [w]