Various decorations related updates

 * remove deprecated TConf stuff
 * Remove 'style' from DeConf
 * Change DeConf to Theme
 * share defaultTheme across all decorations

darcs-hash:20080130064624-a5988-98fcf49dde956e318f801e934f2045cf94c951d5.gz

1 files changed, 7 insertions, 9 deletions

diff --git a/XMonad/Layout/DwmStyle.hs b/XMonad/Layout/DwmStyle.hs
index bef196f..623db56 100644
--- a/XMonad/Layout/DwmStyle.hs
+++ b/XMonad/Layout/DwmStyle.hs
@@ -16,8 +16,9 @@ module XMonad.Layout.DwmStyle
     ( -- * Usage:
       -- $usage
       dwmStyle
-    , DeConfig (..)
-    , DwmStyle (..), defaultDwmStyleConfig
+    , Theme (..)
+    , defaultTheme
+    , DwmStyle (..)
     , shrinkText, CustomShrink(CustomShrink)
     , Shrinker(..)
     ) where
@@ -35,7 +36,7 @@ import XMonad.Layout.Decoration
 -- Then edit your @layoutHook@ by adding the DwmStyle decoration to
 -- your layout:
 --
--- > myL = dwmStyle shrinkText defaultDwmStyleConfig (layoutHook defaultConfig)
+-- > myL = dwmStyle shrinkText defaultTheme (layoutHook defaultConfig)
 -- > main = xmonad defaultConfig { layoutHook = myL }
 --
 -- For more detailed instructions on editing the layoutHook see:
@@ -44,7 +45,7 @@ import XMonad.Layout.Decoration
 --
 -- You can also edit the default configuration options.
 --
--- > myDWConfig = defaultDwmStyleConfig { inactiveBorderColor = "red"
+-- > myDWConfig = defaultTheme { inactiveBorderColor = "red"
 -- >                                    , inactiveTextColor   = "red"}
 --
 -- and
@@ -52,12 +53,9 @@ import XMonad.Layout.Decoration
 -- > myL = dwmStyle shrinkText myDWConfig (layoutHook defaultConfig)
 
 -- | Add simple old dwm-style decorations to windows of a layout.
-dwmStyle :: (Eq a, Shrinker s) => s -> DeConfig DwmStyle a
+dwmStyle :: (Eq a, Shrinker s) => s -> Theme
          -> l a -> ModifiedLayout (Decoration DwmStyle s) l a
-dwmStyle s c = decoration s c
-
-defaultDwmStyleConfig :: Eq a => DeConfig DwmStyle a
-defaultDwmStyleConfig= mkDefaultDeConfig Dwm
+dwmStyle s c = decoration s c Dwm
 
 data DwmStyle a = Dwm deriving (Show, Read)