twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 11:30:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Better control over GridVariants geometry

Browse Source 
Added new messages the layout understands to allow changing the grid aspect
ratio and setting the fraction of the master to a given value rather than
changing it relative to the current value.
This commit is contained in:
nzeh 2011-09-07 13:33:04 +00:00
parent 2e91cde115
commit c4f3e94377
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
XMonad/Layout/GridVariants.hs
View File

@ -19,7 +19,8 @@
module XMonad.Layout.GridVariants ( -- * Usage module XMonad.Layout.GridVariants ( -- * Usage
-- $usage -- $usage
ChangeMasterGeom(..) ChangeMasterGridGeom(..)
, ChangeGridGeom(..)
, Grid(..) , Grid(..)
, TallGrid(..) , TallGrid(..)
, SplitGrid(..) , SplitGrid(..)
@ -68,9 +69,24 @@ instance LayoutClass Grid a where
nwins = length wins nwins = length wins
rects = arrangeAspectGrid rect nwins aspect rects = arrangeAspectGrid rect nwins aspect
pureMessage layout msg = fmap (changeGridAspect layout) (fromMessage msg)
description _ = "Grid" description _ = "Grid"
-- | SplitGrid layout. Parameters are changeGridAspect :: Grid a -> ChangeGridGeom -> Grid a
changeGridAspect (Grid _) (SetGridAspect aspect) = Grid aspect
changeGridAspect (Grid aspect) (ChangeGridAspect delta) =
Grid (max 0.00001 (aspect + delta))
-- |Geometry change messages understood by Grid and SplitGrid
data ChangeGridGeom
= SetGridAspect !Rational
| ChangeGridAspect !Rational
deriving Typeable
instance Message ChangeGridGeom
-- |SplitGrid layout. Parameters are
-- --
-- - side where the master is -- - side where the master is
-- - number of master rows -- - number of master rows
@ -81,8 +97,8 @@ instance LayoutClass Grid a where
data SplitGrid a = SplitGrid Orientation !Int !Int !Rational !Rational !Rational data SplitGrid a = SplitGrid Orientation !Int !Int !Rational !Rational !Rational
deriving (Read, Show) deriving (Read, Show)
-- | Type to specify the side of the screen that holds -- |Type to specify the side of the screen that holds
-- the master area of a SplitGrid. -- the master area of a SplitGrid.
data Orientation = T | B | L | R data Orientation = T | B | L | R
deriving (Eq, Read, Show) deriving (Eq, Read, Show)
@ -95,20 +111,23 @@ instance LayoutClass SplitGrid a where
rects = arrangeSplitGrid rect o nwins mrows mcols mfrac saspect rects = arrangeSplitGrid rect o nwins mrows mcols mfrac saspect
pureMessage layout msg = pureMessage layout msg =
msum [ fmap (resizeMaster layout) (fromMessage msg) msum [ fmap (resizeMaster layout) (fromMessage msg)
, fmap (changeMasterGrid layout) (fromMessage msg) ] , fmap (changeMasterGrid layout) (fromMessage msg)
, fmap (changeSlaveGridAspect layout) (fromMessage msg)
]
description _ = "SplitGrid" description _ = "SplitGrid"
-- |The geometry change message understood by the master grid -- |The geometry change message understood by the master grid
data ChangeMasterGeom data ChangeMasterGridGeom
= IncMasterRows !Int -- ^Change the number of master rows = IncMasterRows !Int -- ^Change the number of master rows
| IncMasterCols !Int -- ^Change the number of master columns | IncMasterCols !Int -- ^Change the number of master columns
| SetMasterRows !Int -- ^Set the number of master rows to absolute value | SetMasterRows !Int -- ^Set the number of master rows to absolute value
| SetMasterCols !Int -- ^Set the number of master columns to absolute value | SetMasterCols !Int -- ^Set the number of master columns to absolute value
| SetMasterFraction !Rational -- ^Set the fraction of the screen used by the master grid
deriving Typeable deriving Typeable
instance Message ChangeMasterGeom instance Message ChangeMasterGridGeom
arrangeSplitGrid :: Rectangle -> Orientation -> Int -> Int -> Int -> Rational -> Rational -> [Rectangle] arrangeSplitGrid :: Rectangle -> Orientation -> Int -> Int -> Int -> Rational -> Rational -> [Rectangle]
arrangeSplitGrid rect@(Rectangle rx ry rw rh) o nwins mrows mcols mfrac saspect arrangeSplitGrid rect@(Rectangle rx ry rw rh) o nwins mrows mcols mfrac saspect
@ -185,7 +204,7 @@ resizeMaster (SplitGrid o mrows mcols mfrac saspect delta) Shrink =
resizeMaster (SplitGrid o mrows mcols mfrac saspect delta) Expand = resizeMaster (SplitGrid o mrows mcols mfrac saspect delta) Expand =
SplitGrid o mrows mcols (min 1 (mfrac + delta)) saspect delta SplitGrid o mrows mcols (min 1 (mfrac + delta)) saspect delta
changeMasterGrid :: SplitGrid a -> ChangeMasterGeom -> SplitGrid a changeMasterGrid :: SplitGrid a -> ChangeMasterGridGeom -> SplitGrid a
changeMasterGrid (SplitGrid o mrows mcols mfrac saspect delta) (IncMasterRows d) = changeMasterGrid (SplitGrid o mrows mcols mfrac saspect delta) (IncMasterRows d) =
SplitGrid o (max 0 (mrows + d)) mcols mfrac saspect delta SplitGrid o (max 0 (mrows + d)) mcols mfrac saspect delta
changeMasterGrid (SplitGrid o mrows mcols mfrac saspect delta) (IncMasterCols d) = changeMasterGrid (SplitGrid o mrows mcols mfrac saspect delta) (IncMasterCols d) =
@ -194,6 +213,14 @@ changeMasterGrid (SplitGrid o _ mcols mfrac saspect delta) (SetMasterRows mrows)
SplitGrid o (max 0 mrows) mcols mfrac saspect delta SplitGrid o (max 0 mrows) mcols mfrac saspect delta
changeMasterGrid (SplitGrid o mrows _ mfrac saspect delta) (SetMasterCols mcols) = changeMasterGrid (SplitGrid o mrows _ mfrac saspect delta) (SetMasterCols mcols) =
SplitGrid o mrows (max 0 mcols) mfrac saspect delta SplitGrid o mrows (max 0 mcols) mfrac saspect delta
changeMasterGrid (SplitGrid o mrows mcols _ saspect delta) (SetMasterFraction mfrac) =
SplitGrid o mrows mcols mfrac saspect delta
changeSlaveGridAspect :: SplitGrid a -> ChangeGridGeom -> SplitGrid a
changeSlaveGridAspect (SplitGrid o mrows mcols mfrac _ delta) (SetGridAspect saspect) =
SplitGrid o mrows mcols mfrac saspect delta
changeSlaveGridAspect (SplitGrid o mrows mcols mfrac saspect delta) (ChangeGridAspect sdelta) =
SplitGrid o mrows mcols mfrac (max 0.00001 (saspect + sdelta)) delta
-- | TallGrid layout. Parameters are -- | TallGrid layout. Parameters are
-- --