diff options
| author | Andrea Rossato <andrea.rossato@unibz.it> | 2008-01-26 10:21:41 +0100 |
|---|---|---|
| committer | Andrea Rossato <andrea.rossato@unibz.it> | 2008-01-26 10:21:41 +0100 |
| commit | 903183d6b80cc4c248eea04a82dca47c7c9f0082 (patch) | |
| tree | d182426a57211bd2fb9fc19a4afaa71ee95229b2 | |
| parent | f076e4542fdf9e1ab293487c54eacbb0d5a06057 (diff) | |
| download | XMonadContrib-903183d6b80cc4c248eea04a82dca47c7c9f0082.tar.gz XMonadContrib-903183d6b80cc4c248eea04a82dca47c7c9f0082.tar.xz XMonadContrib-903183d6b80cc4c248eea04a82dca47c7c9f0082.zip | |
Don't export TConf anymore and export DeConfig instead
WARNING: this patch may be breaking your configuration. While it is
still possible to use:
tabbed shrinkText defaultTConf
updating the fields of the defaultTConf record is not possible
anymore, since the type TConf is now hidden.
WARNING: "tabSize" has been substituted by "decoHeight"
You can change your configuration this way:
myTConf :: TConf
myTConf
darcs-hash:20080126092141-32816-e85f5278e303d811f487460f68f0a15082476d2d.gz
| -rw-r--r-- | XMonad/Config/Arossato.hs | 22 | ||||
| -rw-r--r-- | XMonad/Config/Sjanssen.hs | 4 | ||||
| -rw-r--r-- | XMonad/Layout/Tabbed.hs | 3 |
3 files changed, 15 insertions, 14 deletions
diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs index 7ed309b..5c30f67 100644 --- a/XMonad/Config/Arossato.hs +++ b/XMonad/Config/Arossato.hs @@ -76,16 +76,16 @@ import XMonad.Prompt.XMonad -- | My configuration for the Tabbed Layout. Basically this is the -- Ion3 clean style. -arossatoTabbedConfig :: TConf -arossatoTabbedConfig = - defaultTConf { activeColor = "#8a999e" - , inactiveColor = "#545d75" - , activeBorderColor = "white" - , inactiveBorderColor = "grey" - , activeTextColor = "white" - , inactiveTextColor = "grey" - , tabSize = 15 - } +arossatoTabbedConfig :: DeConfig TabbedDecoration Window +arossatoTabbedConfig = defaultTabbedConfig + { activeColor = "#8a999e" + , inactiveColor = "#545d75" + , activeBorderColor = "white" + , inactiveBorderColor = "grey" + , activeTextColor = "white" + , inactiveTextColor = "grey" + , decoHeight = 15 + } arossatoConfig = defaultConfig { workspaces = ["home","var","dev","mail","web","doc"] ++ @@ -106,7 +106,7 @@ arossatoConfig = defaultConfig } where -- layouts - mytab = tabbed shrinkText arossatoTabbedConfig + mytab = tabDeco shrinkText arossatoTabbedConfig tiled = Tall 1 (3/100) (1/2) -- manageHook diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs index fdf4671..a9c61fc 100644 --- a/XMonad/Config/Sjanssen.hs +++ b/XMonad/Config/Sjanssen.hs @@ -29,7 +29,7 @@ sjanssenConfig = do , ((modm, button2), (\w -> focus w >> windows W.swapMaster)) , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ] , keys = \c -> mykeys c `M.union` keys defaultConfig c - , layoutHook = avoidStruts $ smartBorders (tiled Tall ||| tiled Wide ||| Full ||| tabbed shrinkText myTConf) + , layoutHook = avoidStruts $ smartBorders (tiled Tall ||| tiled Wide ||| Full ||| tabDeco shrinkText myTConf) , manageHook = manageHook defaultConfig <+> manageDocks } where @@ -44,7 +44,7 @@ sjanssenConfig = do ] myFont = "xft:Bitstream Vera Sans Mono:pixelsize=10" - myTConf = defaultTConf { fontName = myFont } + myTConf = defaultTabbedConfig { fontName = myFont } myPromptConfig = defaultXPConfig { position = Top , font = myFont diff --git a/XMonad/Layout/Tabbed.hs b/XMonad/Layout/Tabbed.hs index 3581793..dfedb6b 100644 --- a/XMonad/Layout/Tabbed.hs +++ b/XMonad/Layout/Tabbed.hs @@ -25,7 +25,8 @@ module XMonad.Layout.Tabbed -- $usage tabbed , tabDeco - , TConf (..), defaultTConf + , defaultTConf + , DeConfig (..) , TabbedDecoration (..), defaultTabbedConfig , shrinkText, CustomShrink(CustomShrink) , Shrinker(..) |