diff options
| author | David Roundy <droundy@darcs.net> | 2007-06-29 22:45:18 +0200 |
|---|---|---|
| committer | David Roundy <droundy@darcs.net> | 2007-06-29 22:45:18 +0200 |
| commit | 9f50fe94eda4f03e938d73490c3f082b6698f7b4 (patch) | |
| tree | 3589bbdadb10cbebfa0a8c94a51a7873bfaa3510 /Decoration.hs | |
| parent | d804d114ade5ab048d185b4a72f81a1f525597c5 (diff) | |
| download | XMonadContrib-9f50fe94eda4f03e938d73490c3f082b6698f7b4.tar.gz XMonadContrib-9f50fe94eda4f03e938d73490c3f082b6698f7b4.tar.xz XMonadContrib-9f50fe94eda4f03e938d73490c3f082b6698f7b4.zip | |
resolve conflicts in Decoration and Tabbed.
Note that you no longer need simpleStacking when using tabbed.
darcs-hash:20070629204518-72aca-9d2b708c6eb60b3d6c1370fc41349b2a3c86819d.gz
Diffstat (limited to 'Decoration.hs')
| -rw-r--r-- | Decoration.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Decoration.hs b/Decoration.hs index 2543af9..8eae4d7 100644 --- a/Decoration.hs +++ b/Decoration.hs @@ -33,9 +33,10 @@ import Operations ( UnDoLayout(UnDoLayout) ) -- You can use this module for writing other extensions. -- See, for instance, "XMonadContrib.Tabbed" -newDecoration :: Window -> Rectangle -> Int -> Pixel -> Pixel - -> (Display -> Window -> GC -> X ()) -> X () -> X Window -newDecoration decfor (Rectangle x y w h) th fg bg draw click = do +newDecoration :: Window -> Rectangle -> Int -> Pixel -> Pixel -> String + -> (Display -> Window -> GC -> FontStruct -> X ()) + -> X () -> Layout a -> X (Layout a) +newDecoration decfor (Rectangle x y w h) th fg bg fn draw click l = do d <- asks display rt <- asks theRoot win <- io $ createSimpleWindow d rt x y w h (fromIntegral th) fg bg |