From 6769de07f7e06ddf6eea728bd7072ebfe6eff017 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel@wagner-home.com>
Date: Tue, 28 May 2013 03:39:09 +0200
Subject: use Data.Default wherever possible, and deprecate the things it
 replaces

Ignore-this: 898458b1d2868a70dfb09faf473dc7aa

darcs-hash:20130528013909-76d51-863278165b6f149c47b08b31b34e85ddcab19f1f.gz
---
 XMonad/Layout/Groups/Examples.hs | 13 +++++++++----
 XMonad/Layout/Groups/Wmii.hs     |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'XMonad/Layout/Groups')

diff --git a/XMonad/Layout/Groups/Examples.hs b/XMonad/Layout/Groups/Examples.hs
index 9407c9b..937d58f 100644
--- a/XMonad/Layout/Groups/Examples.hs
+++ b/XMonad/Layout/Groups/Examples.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-{-# LANGUAGE MultiParamTypeClasses, Rank2Types #-}
+{-# LANGUAGE MultiParamTypeClasses, Rank2Types, TypeFamilies #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -36,6 +36,7 @@ module XMonad.Layout.Groups.Examples ( -- * Usage
                                      , mirrorTallTabs
                                      , fullTabs
                                      , TiledTabsConfig(..)
+                                     , def
                                      , defaultTiledTabsConfig
                                      , increaseNMasterGroups
                                      , decreaseNMasterGroups
@@ -180,9 +181,9 @@ toggleWindowFull = sendMessage ZoomFullToggle
 -- You can use any of these three layouts by including it in your layout hook.
 -- You will need to provide it with a 'TiledTabsConfig' containing the size
 -- parameters for 'Tall' and 'Mirror' 'Tall', and the shrinker and decoration theme
--- for the tabs. If you're happy with defaults, you can use 'defaultTiledTabsConfig':
+-- for the tabs. If you're happy with defaults, you can use 'def':
 --
--- > myLayout = tallTabs defaultTiledTabsConfig
+-- > myLayout = tallTabs def
 --
 -- To be able to increase\/decrease the number of master groups and shrink\/expand
 -- the master area, you can create key bindings for the relevant actions:
@@ -201,8 +202,12 @@ data TiledTabsConfig s = TTC { vNMaster :: Int
                              , tabsShrinker :: s
                              , tabsTheme :: Theme }
 
+instance s ~ DefaultShrinker => Default (TiledTabsConfig s) where
+    def = TTC 1 0.5 (3/100) 1 0.5 (3/100) shrinkText def
+
+{-# DEPRECATED defaultTiledTabsConfig "Use def (from Data.Default, and re-exported by XMonad.Layout.Groups) instead." #-}
 defaultTiledTabsConfig :: TiledTabsConfig DefaultShrinker
-defaultTiledTabsConfig = TTC 1 0.5 (3/100) 1 0.5 (3/100) shrinkText defaultTheme
+defaultTiledTabsConfig = def
 
 fullTabs c = _tab c $ G.group _tabs $ Full ||| _vert c ||| _horiz c
 
diff --git a/XMonad/Layout/Groups/Wmii.hs b/XMonad/Layout/Groups/Wmii.hs
index da45149..fc0b59f 100644
--- a/XMonad/Layout/Groups/Wmii.hs
+++ b/XMonad/Layout/Groups/Wmii.hs
@@ -30,6 +30,7 @@ module XMonad.Layout.Groups.Wmii ( -- * Usage
 
                                    -- * Useful re-exports
                                  , shrinkText
+                                 , def
                                  , defaultTheme
                                  , module XMonad.Layout.Groups.Helpers ) where
 
@@ -71,7 +72,7 @@ import XMonad.Layout.Simplest
 -- (with a 'Shrinker' and decoration 'Theme' as
 -- parameters) to your layout hook, for example:
 --
--- > myLayout = wmii shrinkText defaultTheme
+-- > myLayout = wmii shrinkText def
 --
 -- To be able to zoom in and out of groups, change their inner layout, etc.,
 -- create key bindings for the relevant actions:
-- 
cgit v1.2.3