From a65fa745da0237f94af01193dae320be66e74768 Mon Sep 17 00:00:00 2001
From: David Roundy <droundy@darcs.net>
Date: Tue, 5 Feb 2008 21:40:43 +0100
Subject: 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
---
 XMonad/Config/Droundy.hs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'XMonad/Config/Droundy.hs')

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' 
-- 
cgit v1.2.3