From 9f50fe94eda4f03e938d73490c3f082b6698f7b4 Mon Sep 17 00:00:00 2001 From: David Roundy Date: Fri, 29 Jun 2007 22:45:18 +0200 Subject: resolve conflicts in Decoration and Tabbed. Note that you no longer need simpleStacking when using tabbed. darcs-hash:20070629204518-72aca-9d2b708c6eb60b3d6c1370fc41349b2a3c86819d.gz --- Decoration.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Decoration.hs') 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 -- cgit v1.2.3