diff options
author | David Roundy <droundy@darcs.net> | 2008-02-05 21:40:43 +0100 |
---|---|---|
committer | David Roundy <droundy@darcs.net> | 2008-02-05 21:40:43 +0100 |
commit | a65fa745da0237f94af01193dae320be66e74768 (patch) | |
tree | 4f9dfde144d32696bda084203d1b6ab3a2cbd893 /XMonad/Config | |
parent | d18d5f4c6905afe13a4040b6f01d113bc9b471a4 (diff) | |
download | XMonadContrib-a65fa745da0237f94af01193dae320be66e74768.tar.gz XMonadContrib-a65fa745da0237f94af01193dae320be66e74768.tar.xz XMonadContrib-a65fa745da0237f94af01193dae320be66e74768.zip |
roll back to previous version of Droundy.hs.
A cleaner WindowNavigation fix made the separation of tabbed and addTabs
not strictly necessary (but still a desireable possibility in my opinion,
as it allows pretty decoration of non-composite layouts that might want to
have some of their windows tabbed.
darcs-hash:20080205204043-72aca-dc02471d49791c03f2a3671ff13dc8c9b0c1bd76.gz
Diffstat (limited to '')
-rw-r--r-- | XMonad/Config/Droundy.hs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs index 9293bdd..4cdf726 100644 --- a/XMonad/Config/Droundy.hs +++ b/XMonad/Config/Droundy.hs @@ -6,7 +6,7 @@ -- ------------------------------------------------------------------------ -module XMonad.Config.Droundy ( config ) where +module XMonad.Config.Droundy ( config, mytab ) where --import Control.Monad.State ( modify ) @@ -21,7 +21,6 @@ import System.Exit -- % Extension-provided imports -import XMonad.Layout.Simplest import XMonad.Layout.Tabbed import XMonad.Layout.Combo import XMonad.Layout.Mosaic @@ -33,7 +32,7 @@ import XMonad.Layout.WindowNavigation import XMonad.Layout.NoBorders import XMonad.Layout.WorkspaceDir import XMonad.Layout.ToggleLayouts -import XMonad.Layout.ShowWName ( showWName ) +import XMonad.Layout.ShowWName import XMonad.Prompt import XMonad.Prompt.Layout @@ -134,14 +133,13 @@ config = -- withUrgencyHook FocusUrgencyHook $ defaultConfig { borderWidth = 1 -- Width of the window border in pixels. , XMonad.workspaces = ["1:mutt","2:iceweasel"] - , layoutHook = addTabs CustomShrink defaultTheme $ showWName $ workspaceDir "~" $ - windowNavigation $ + , layoutHook = showWName $ workspaceDir "~" $ windowNavigation $ toggleLayouts (noBorders Full) $ avoidStruts $ - named "tabbed" (noBorders Simplest) ||| - named "xclock" (Simplest ****//* combineTwo Square Simplest Simplest) ||| - named "three" (Simplest **//* Simplest *//* combineTwo Square Simplest Simplest) ||| - named "widescreen" ((Simplest *||* Simplest) - ****//* combineTwo Square Simplest Simplest) -- ||| + named "tabbed" (noBorders mytab) ||| + named "xclock" (mytab ****//* combineTwo Square mytab mytab) ||| + named "three" (mytab **//* mytab *//* combineTwo Square mytab mytab) ||| + named "widescreen" ((mytab *||* mytab) + ****//* combineTwo Square mytab mytab) -- ||| --mosaic 0.25 0.5 , manageHook = manageHook defaultConfig <+> manageDocks -- add panel-handling , logHook = ewmhDesktopsLogHook -- actually, no logging here, just other stuff @@ -152,6 +150,8 @@ config = -- withUrgencyHook FocusUrgencyHook $ , XMonad.keys = keys } +mytab = tabbed CustomShrink defaultTheme + instance Shrinker CustomShrink where shrinkIt shr s | Just s' <- dropFromHead " " s = shrinkIt shr s' shrinkIt shr s | Just s' <- dropFromTail " " s = shrinkIt shr s' |