From c7aa0dab570f8cebb1379493eaca89462f6c5b1b Mon Sep 17 00:00:00 2001
From: Dominik Bruhn <dominik@dbruhn.de>
Date: Wed, 12 Nov 2008 14:46:30 +0100
Subject: Simplify code for restriction-calculation and remove compiletime
 warnings

darcs-hash:20081112134630-ae55e-ef7a0d2837203d784d8298f1d65f49bdffc7400f.gz
---
 XMonad/Actions/GridSelect.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'XMonad/Actions/GridSelect.hs')

diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
index 3ea97a4..05dde60 100644
--- a/XMonad/Actions/GridSelect.hs
+++ b/XMonad/Actions/GridSelect.hs
@@ -237,8 +237,10 @@ gridselect gsconfig =
         screenHeight = toInteger $ rect_height s;
     selectedWindow <- if (status == grabSuccess) then
                           do
-                            let restrictX = floor $ ((fromInteger screenWidth)/(fromInteger $ gs_cellwidth gsconfig)-1)/2 ;
-                                restrictY = floor $ ((fromInteger screenHeight)/(fromInteger $ gs_cellheight gsconfig)-1)/2 ;
+                            let restriction :: Integer -> (GSConfig -> Integer) -> Double
+                                restriction ss cs = ((fromInteger ss)/(fromInteger $ cs gsconfig)-1)/2
+                                restrictX = floor $ restriction screenWidth gs_cellwidth
+                                restrictY = floor $ restriction screenHeight gs_cellheight
                                 winmap = zipWith (,) (diamondRestrict restrictX restrictY) windowList
                             selectedWindow <- evalStateT (do updateAllWindows; eventLoop)
                                                    (TwoDState (0,0)
-- 
cgit v1.2.3