diff --git a/XMonad/Layout/Decoration.hs b/XMonad/Layout/Decoration.hs index 72051fe0..7cf8acfd 100644 --- a/XMonad/Layout/Decoration.hs +++ b/XMonad/Layout/Decoration.hs @@ -20,6 +20,7 @@ module XMonad.Layout.Decoration -- $usage decoration , Decoration + , DefaultDecoration (..) , DecorationStyle (..) , DecorationMsg (..) , Theme (..), defaultTheme @@ -129,6 +130,9 @@ class (Read (ds a), Show (ds a)) => DecorationStyle ds a where -> W.Stack a -> [(a,Rectangle)] -> (a,Rectangle) -> X (Maybe Rectangle) decorate ds w h r s ars ar = return $ pureDecoration ds w h r s ars ar +data DefaultDecoration a = DefaultDecoration deriving ( Read, Show ) +instance DecorationStyle DefaultDecoration a + instance (DecorationStyle ds Window, Shrinker s) => LayoutModifier (Decoration ds s) Window where redoLayout (Decoration st sh t ds) sc stack wrs | decorate_first = do whenIJust st releaseResources diff --git a/XMonad/Layout/DecorationMadness.hs b/XMonad/Layout/DecorationMadness.hs index 4b939fd2..ec347ef3 100644 --- a/XMonad/Layout/DecorationMadness.hs +++ b/XMonad/Layout/DecorationMadness.hs @@ -125,10 +125,6 @@ import XMonad.Layout.WindowArranger -- WindowNavigation and with some layout combinators. I hope to fix -- this problem shortly! --- The xmonad default decoration modifier! -data DefaultDecoration a = DefaultDecoration deriving ( Read, Show ) -instance DecorationStyle DefaultDecoration a - -- There may be a regression in Tabbed, and no tab is displayed when -- using it with other layouts. This is the reason for the following -- instance (to be removed!)