summaryrefslogtreecommitdiffstats
path: root/MetaTile/Operations.hs
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-09-12 21:08:13 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-09-12 21:08:13 +0200
commit3bf5609453485e8b20a75797994ff3b64d8c60ed (patch)
treebaf5eea0458537c5fdf217847e850fe305303c10 /MetaTile/Operations.hs
parent29e342c4985744cc2538d85cdbb248e6dd5f5ff8 (diff)
downloadmetatile-3bf5609453485e8b20a75797994ff3b64d8c60ed.tar
metatile-3bf5609453485e8b20a75797994ff3b64d8c60ed.zip
Split up window and frame state
Diffstat (limited to 'MetaTile/Operations.hs')
-rw-r--r--MetaTile/Operations.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/MetaTile/Operations.hs b/MetaTile/Operations.hs
index db2e264..b45403f 100644
--- a/MetaTile/Operations.hs
+++ b/MetaTile/Operations.hs
@@ -190,7 +190,8 @@ hide w = whenX (getsWindowState wsMapped w) $ withDisplay $ \d -> do
configureClientWindow :: Window -> X ()
configureClientWindow w = withDisplay $ \d -> do
- (frame, bw) <- getsWindowState (wsFrame &&& wsBorderWidth) w
+ frame <- getsWindowState wsFrame w
+ Just bw <- getsFrameState fsBorderWidth frame
(_, x, y, width, height, _, _) <- io $ getGeometry d frame
let least1 n = max 1 n
x' = x + (fi $ bwLeft bw)
@@ -251,7 +252,7 @@ tileWindow w r bw = withDisplay $ \d -> do
let least x | x <= 0 = 1
| otherwise = x
frame <- getsWindowState wsFrame w
- modifyWindowState (\ws -> ws {wsBorderWidth = bw}) w
+ modifyFrameState (\fs -> fs {fsBorderWidth = bw}) frame
io $ moveResizeWindow d frame (rect_x r) (rect_y r) (least $ rect_width r) (least $ rect_height r)
-- ---------------------------------------------------------------------