diff --git a/XMonad/Actions/Plane.hs b/XMonad/Actions/Plane.hs index 862eaaf4..26546114 100644 --- a/XMonad/Actions/Plane.hs +++ b/XMonad/Actions/Plane.hs @@ -38,7 +38,7 @@ module XMonad.Actions.Plane ) where -import Data.Map hiding (split) +import Data.Map (Map, fromList) import XMonad.Prelude import XMonad diff --git a/XMonad/Layout/Decoration.hs b/XMonad/Layout/Decoration.hs index 7e0e50e1..bd4fbc8c 100644 --- a/XMonad/Layout/Decoration.hs +++ b/XMonad/Layout/Decoration.hs @@ -245,7 +245,6 @@ instance (DecorationStyle ds Window, Shrinker s) => LayoutModifier (Decoration d let ndwrs = zip toAdd $ repeat (Nothing,Nothing) ndecos <- resync (ndwrs ++ del_dwrs d dwrs) wrs processState (s {decos = ndecos }) - | otherwise = return (wrs, Nothing) where ws = map fst wrs diff --git a/XMonad/Layout/ResizeScreen.hs b/XMonad/Layout/ResizeScreen.hs index b99a35f5..134c6d3d 100644 --- a/XMonad/Layout/ResizeScreen.hs +++ b/XMonad/Layout/ResizeScreen.hs @@ -64,13 +64,12 @@ data ResizeScreen a = ResizeScreen ResizeMode Int data ResizeMode = T | B | L | R deriving (Read, Show) instance LayoutModifier ResizeScreen a where - modifyLayout m ws rect@(Rectangle x y w h) + modifyLayout m ws (Rectangle x y w h) | ResizeScreen L i <- m = resize $ Rectangle (x + fi i) y (w - fi i) h | ResizeScreen R i <- m = resize $ Rectangle x y (w - fi i) h | ResizeScreen T i <- m = resize $ Rectangle x (y + fi i) w (h - fi i) | ResizeScreen B i <- m = resize $ Rectangle x y w (h - fi i) | WithNewScreen r <- m = resize r - | otherwise = resize rect where resize nr = runLayout ws nr pureMess (ResizeScreen d _) m