mirror of
https://github.com/xmonad/xmonad.git
synced 2025-08-01 20:51:55 -07:00
Use Tall and Wide for split screen layouts. This should be less confusing.
This commit is contained in:
@@ -84,11 +84,8 @@ keys = M.fromList $
|
|||||||
, ((modMask, xK_j ), raise GT)
|
, ((modMask, xK_j ), raise GT)
|
||||||
, ((modMask, xK_k ), raise LT)
|
, ((modMask, xK_k ), raise LT)
|
||||||
|
|
||||||
, ((modMask, xK_h ), changeHorz (negate defaultDelta))
|
, ((modMask, xK_h ), changeSplit (negate defaultDelta))
|
||||||
, ((modMask, xK_l ), changeHorz defaultDelta)
|
, ((modMask, xK_l ), changeSplit defaultDelta)
|
||||||
-- Not implemented yet:
|
|
||||||
-- , ((modMask .|. shiftMask, xK_j ), changeVert defaultDelta)
|
|
||||||
-- , ((modMask .|. shiftMask, xK_k ), changeVert (negate defaultDelta))
|
|
||||||
|
|
||||||
, ((modMask .|. shiftMask, xK_c ), kill)
|
, ((modMask .|. shiftMask, xK_c ), kill)
|
||||||
|
|
||||||
|
@@ -37,8 +37,8 @@ refresh = do
|
|||||||
mapM_ (\(w, Rectangle a b c e) -> io $ moveResizeWindow d w a b c e) $
|
mapM_ (\(w, Rectangle a b c e) -> io $ moveResizeWindow d w a b c e) $
|
||||||
case layoutType fl of
|
case layoutType fl of
|
||||||
Full -> fmap (flip (,) sc) $ maybeToList $ W.peekStack n ws
|
Full -> fmap (flip (,) sc) $ maybeToList $ W.peekStack n ws
|
||||||
Horz -> tile (tileFraction fl) sc $ W.index n ws
|
Tall -> tile (tileFraction fl) sc $ W.index n ws
|
||||||
Vert -> vtile (tileFraction fl) sc $ W.index n ws
|
Wide -> vtile (tileFraction fl) sc $ W.index n ws
|
||||||
whenJust (W.peekStack n ws) (io . raiseWindow d)
|
whenJust (W.peekStack n ws) (io . raiseWindow d)
|
||||||
whenJust (W.peek ws) setFocus
|
whenJust (W.peek ws) setFocus
|
||||||
|
|
||||||
@@ -68,9 +68,9 @@ flipRect (Rectangle { rect_x = x, rect_y = y, rect_width = w, rect_height = h })
|
|||||||
switchLayout :: X ()
|
switchLayout :: X ()
|
||||||
switchLayout = layout $ \fl -> fl { layoutType = rot (layoutType fl) }
|
switchLayout = layout $ \fl -> fl { layoutType = rot (layoutType fl) }
|
||||||
|
|
||||||
-- | changeHorz. Changes the horizontal split.
|
-- | changeSplit. Changes the window split.
|
||||||
changeHorz :: Rational -> X ()
|
changeSplit :: Rational -> X ()
|
||||||
changeHorz delta = layout $ \fl ->
|
changeSplit delta = layout $ \fl ->
|
||||||
fl { tileFraction = min 1 (max 0 (tileFraction fl + delta)) }
|
fl { tileFraction = min 1 (max 0 (tileFraction fl + delta)) }
|
||||||
|
|
||||||
-- | layout. Modify the current workspace's layout with a pure
|
-- | layout. Modify the current workspace's layout with a pure
|
||||||
|
@@ -51,7 +51,7 @@ data XState = XState
|
|||||||
type WorkSpace = StackSet Window
|
type WorkSpace = StackSet Window
|
||||||
|
|
||||||
-- | The different layout modes
|
-- | The different layout modes
|
||||||
data Layout = Full | Horz | Vert deriving (Enum, Bounded)
|
data Layout = Full | Tall | Wide deriving (Enum, Bounded)
|
||||||
|
|
||||||
-- | 'rot' for Layout.
|
-- | 'rot' for Layout.
|
||||||
rot :: Layout -> Layout
|
rot :: Layout -> Layout
|
||||||
|
Reference in New Issue
Block a user