aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2008-03-26 04:45:41 +0100
committerSpencer Janssen <sjanssen@cse.unl.edu>2008-03-26 04:45:41 +0100
commite80fdc8ebb807632f320a5917b295daadf0d06cb (patch)
tree2f4f91d1bace28689339f1e572bccd9808fd1114
parent42263db712eb9b672ce92ab92e4128bb89f2d331 (diff)
downloadXMonadContrib-e80fdc8ebb807632f320a5917b295daadf0d06cb.tar.gz
XMonadContrib-e80fdc8ebb807632f320a5917b295daadf0d06cb.tar.xz
XMonadContrib-e80fdc8ebb807632f320a5917b295daadf0d06cb.zip
Fix bugs in Tabbed and TabBarDecoration -- please remember multi-head!
darcs-hash:20080326034541-a5988-94e33a7c01ac2ec88fe8601c7fd77536c48ea6d2.gz
-rw-r--r--XMonad/Layout/TabBarDecoration.hs2
-rw-r--r--XMonad/Layout/Tabbed.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/XMonad/Layout/TabBarDecoration.hs b/XMonad/Layout/TabBarDecoration.hs
index 9339a64..5305428 100644
--- a/XMonad/Layout/TabBarDecoration.hs
+++ b/XMonad/Layout/TabBarDecoration.hs
@@ -75,4 +75,4 @@ instance Eq a => DecorationStyle TabBarDecoration a where
ny = case p of
Top -> y
Bottom -> y + fi ht - fi dht
- nx = maybe x (fi . loc) $ w `elemIndex` wrs
+ nx = (x +) $ maybe 0 (fi . loc) $ w `elemIndex` wrs
diff --git a/XMonad/Layout/Tabbed.hs b/XMonad/Layout/Tabbed.hs
index 1dc6524..e1a45c8 100644
--- a/XMonad/Layout/Tabbed.hs
+++ b/XMonad/Layout/Tabbed.hs
@@ -116,7 +116,7 @@ instance Eq a => DecorationStyle TabbedDecoration a where
where ws = filter (`elem` map fst (filter ((==r) . snd) wrs)) (S.integrate s)
loc i = (wh * fi i) `div` max 1 (fi $ length ws)
wid = maybe (fi x) (\i -> loc (i+1) - loc i) $ w `elemIndex` ws
- nx = maybe x (fi . loc) $ w `elemIndex` ws
+ nx = (x +) $ maybe 0 (fi . loc) $ w `elemIndex` ws
shrink ds (Rectangle _ _ _ dh) (Rectangle x y w h) = case ds of
Tabbed -> Rectangle x (y + fi dh) w (h - dh)
TabbedBottom -> Rectangle x y w (h - dh)