make Circle work with Layout class.

darcs-hash:20070921215525-72aca-e94857d4d2c486cb69bf6f58617f67c11aff42fd.gz

1 files changed, 7 insertions, 7 deletions

diff --git a/Circle.hs b/Circle.hs
index fde2351..225871b 100644
--- a/Circle.hs
+++ b/Circle.hs
@@ -15,7 +15,7 @@
 module XMonadContrib.Circle (
                              -- * Usage
                              -- $usage
-                             circle
+                             Circle
                             ) where -- actually it's an ellipse
 
 import Data.List
@@ -23,8 +23,6 @@ import Graphics.X11.Xlib
 import XMonad
 import StackSet (integrate, peek)
 
-import XMonadContrib.LayoutHelpers ( idModify )
-
 -- $usage
 -- You can use this module with the following in your Config.hs file:
 --
@@ -32,10 +30,12 @@ import XMonadContrib.LayoutHelpers ( idModify )
 
 -- %import XMonadContrib.Circle
 
-circle :: Layout Window
-circle = Layout { doLayout = \r s -> do { layout <- raiseFocus $ circleLayout r $ integrate s
-                                       ;  return (layout, Nothing) }
-                , modifyLayout = idModify }
+data Circle a = Circle deriving ( Read, Show )
+
+instance Layout Circle Window where
+    doLayout Circle r s = do layout <- raiseFocus $ circleLayout r $ integrate s
+                             return (layout, Nothing)
+    modifyLayout Circle _ = return Nothing
 
 circleLayout :: Rectangle -> [a] -> [(a, Rectangle)]
 circleLayout _ []     = []