twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-11 10:12:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant parentheses from L.MouseResizableTile

Browse Source
This commit is contained in:
Adam Vogt
2009-09-30 21:21:10 +00:00
parent bf2fc75035
commit 66b8ad46d0
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
XMonad/Layout/MouseResizableTile.hs
View File

@@ -106,8 +106,8 @@ instance LayoutClass MouseResizableTile a where
num = length wins num = length wins
sr' = mirrorAdjust sr (mirrorRect sr) sr' = mirrorAdjust sr (mirrorRect sr)
(rects, preparedDraggers) = tile (nmaster state) (masterFrac state) (rects, preparedDraggers) = tile (nmaster state) (masterFrac state)
((leftFracs state) ++ repeat mrtFraction) (leftFracs state ++ repeat mrtFraction)
((rightFracs state) ++ repeat mrtFraction) sr' num (rightFracs state ++ repeat mrtFraction) sr' num
rects' = map (mirrorAdjust id mirrorRect . sanitizeRectangle sr') rects rects' = map (mirrorAdjust id mirrorRect . sanitizeRectangle sr') rects
in do in do
mapM_ deleteDragger $ draggers state mapM_ deleteDragger $ draggers state
@@ -123,9 +123,9 @@ instance LayoutClass MouseResizableTile a where
handleMessage state m handleMessage state m
| Just (IncMasterN d) <- fromMessage m = | Just (IncMasterN d) <- fromMessage m =
return $ Just $ state { nmaster = max 0 (nmaster state + d) } return $ Just $ state { nmaster = max 0 (nmaster state + d) }
| Just (Shrink) <- fromMessage m = | Just Shrink <- fromMessage m =
return $ Just $ state { masterFrac = max 0 (masterFrac state - mrtDelta) } return $ Just $ state { masterFrac = max 0 (masterFrac state - mrtDelta) }
| Just (Expand) <- fromMessage m = | Just Expand <- fromMessage m =
return $ Just $ state { masterFrac = min 1 (masterFrac state + mrtDelta) } return $ Just $ state { masterFrac = min 1 (masterFrac state + mrtDelta) }
| Just ShrinkSlave <- fromMessage m = | Just ShrinkSlave <- fromMessage m =
return $ Just $ modifySlave state (-mrtDelta) return $ Just $ modifySlave state (-mrtDelta)
@@ -196,7 +196,7 @@ tile :: Int -> Rational -> [Rational] -> [Rational] -> Rectangle -> Int -> ([Rec
tile nmaster' masterFrac' leftFracs' rightFracs' sr num tile nmaster' masterFrac' leftFracs' rightFracs' sr num
| num <= nmaster' = splitVertically (take (num - 1) leftFracs') sr True 0 | num <= nmaster' = splitVertically (take (num - 1) leftFracs') sr True 0
| nmaster' == 0 = splitVertically (take (num - 1) rightFracs') sr False 0 | nmaster' == 0 = splitVertically (take (num - 1) rightFracs') sr False 0
| otherwise = (leftRects ++ rightRects, [masterDragger] ++ leftDraggers ++ rightDraggers) | otherwise = (leftRects ++ rightRects, masterDragger : leftDraggers ++ rightDraggers)
where ((sr1, sr2), masterDragger) = splitHorizontallyBy masterFrac' sr where ((sr1, sr2), masterDragger) = splitHorizontallyBy masterFrac' sr
(leftRects, leftDraggers) = splitVertically (take (nmaster' - 1) leftFracs') sr1 True 0 (leftRects, leftDraggers) = splitVertically (take (nmaster' - 1) leftFracs') sr1 True 0
(rightRects, rightDraggers) = splitVertically (take (num - nmaster' - 1) rightFracs') sr2 False 0 (rightRects, rightDraggers) = splitVertically (take (num - nmaster' - 1) rightFracs') sr2 False 0
@@ -204,10 +204,10 @@ tile nmaster' masterFrac' leftFracs' rightFracs' sr num
splitVertically :: RealFrac r => [r] -> Rectangle -> Bool -> Int -> ([Rectangle], [DraggerWithRect]) splitVertically :: RealFrac r => [r] -> Rectangle -> Bool -> Int -> ([Rectangle], [DraggerWithRect])
splitVertically [] r _ _ = ([r], []) splitVertically [] r _ _ = ([r], [])
splitVertically (f:fx) (Rectangle sx sy sw sh) isLeft num = splitVertically (f:fx) (Rectangle sx sy sw sh) isLeft num =
let nextRect = Rectangle sx sy sw (smallh - (div mrtDraggerSize 2)) let nextRect = Rectangle sx sy sw $ smallh - div mrtDraggerSize 2
(otherRects, otherDragger) = splitVertically fx (otherRects, otherDragger) = splitVertically fx
(Rectangle sx (sy + fromIntegral smallh + mrtDraggerOffset) (Rectangle sx (sy + fromIntegral smallh + mrtDraggerOffset)
sw (sh - smallh - (div mrtDraggerSize 2))) sw (sh - smallh - div mrtDraggerSize 2))
isLeft (num + 1) isLeft (num + 1)
draggerRect = Rectangle sx (sy + fromIntegral smallh - mrtDraggerOffset) sw mrtDraggerSize draggerRect = Rectangle sx (sy + fromIntegral smallh - mrtDraggerOffset) sw mrtDraggerSize
draggerInfo = if isLeft draggerInfo = if isLeft
@@ -220,9 +220,9 @@ splitVertically (f:fx) (Rectangle sx sy sw sh) isLeft num =
splitHorizontallyBy :: RealFrac r => r -> Rectangle -> ((Rectangle, Rectangle), DraggerWithRect) splitHorizontallyBy :: RealFrac r => r -> Rectangle -> ((Rectangle, Rectangle), DraggerWithRect)
splitHorizontallyBy f (Rectangle sx sy sw sh) = ((leftHalf, rightHalf), (draggerRect, mrtHDoubleArrow, draggerInfo)) splitHorizontallyBy f (Rectangle sx sy sw sh) = ((leftHalf, rightHalf), (draggerRect, mrtHDoubleArrow, draggerInfo))
where leftw = floor $ fromIntegral sw * f where leftw = floor $ fromIntegral sw * f
leftHalf = Rectangle sx sy (leftw - (div mrtDraggerSize 2)) sh leftHalf = Rectangle sx sy (leftw - mrtDraggerSize `div` 2) sh
rightHalf = Rectangle (sx + fromIntegral leftw + mrtDraggerOffset) sy rightHalf = Rectangle (sx + fromIntegral leftw + mrtDraggerOffset) sy
(sw - fromIntegral leftw - (div mrtDraggerSize 2)) sh (sw - fromIntegral leftw - mrtDraggerSize `div` 2) sh
draggerRect = Rectangle (sx + fromIntegral leftw - mrtDraggerOffset) sy mrtDraggerSize sh draggerRect = Rectangle (sx + fromIntegral leftw - mrtDraggerOffset) sy mrtDraggerSize sh
draggerInfo = MasterDragger sx (fromIntegral sw) draggerInfo = MasterDragger sx (fromIntegral sw)
@@ -234,7 +234,6 @@ createDragger sr (draggerRect, draggerCursor, draggerInfo) = do
deleteDragger :: DraggerWithWin -> X () deleteDragger :: DraggerWithWin -> X ()
deleteDragger (draggerWin, _) = deleteWindow draggerWin deleteDragger (draggerWin, _) = deleteWindow draggerWin
handleResize :: [DraggerWithWin] -> Bool -> Event -> X () handleResize :: [DraggerWithWin] -> Bool -> Event -> X ()
handleResize draggers' isM ButtonEvent { ev_window = ew, ev_event_type = et } handleResize draggers' isM ButtonEvent { ev_window = ew, ev_event_type = et }
| et == buttonPress, Just x <- lookup ew draggers' = case x of | et == buttonPress, Just x <- lookup ew draggers' = case x of