From 273410553233b840e2223eaa924300599dce4255 Mon Sep 17 00:00:00 2001 From: Andrea Rossato Date: Sun, 10 Feb 2008 11:43:04 +0100 Subject: Move DefaultDecoration from DecorationMadness to Decoration darcs-hash:20080210104304-32816-9d239fd9c63a1c7d295ad376cefc2d7259446ce8.gz --- XMonad/Layout/Decoration.hs | 4 ++++ XMonad/Layout/DecorationMadness.hs | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/XMonad/Layout/Decoration.hs b/XMonad/Layout/Decoration.hs index 72051fe..7cf8acf 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 4b939fd..ec347ef 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!) -- cgit v1.2.3