diff options
| author | David Roundy <droundy@darcs.net> | 2007-06-12 19:06:25 +0200 |
|---|---|---|
| committer | David Roundy <droundy@darcs.net> | 2007-06-12 19:06:25 +0200 |
| commit | 671f40ba18efd1182c6ad93892064120f89ab1a6 (patch) | |
| tree | 84b91b906a80187f234d03559f983e0db4290348 /Operations.hs | |
| parent | 904b5d31224aaa14fcab522d10de1c6b1d898f68 (diff) | |
| download | metatile-671f40ba18efd1182c6ad93892064120f89ab1a6.tar metatile-671f40ba18efd1182c6ad93892064120f89ab1a6.zip | |
resolve conflict in Operations.
darcs-hash:20070612170625-72aca-5d5ae145d30e5e9e971add6e906f6da30d214834
Diffstat (limited to 'Operations.hs')
| -rw-r--r-- | Operations.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Operations.hs b/Operations.hs index fd85106..0a112b4 100644 --- a/Operations.hs +++ b/Operations.hs @@ -145,7 +145,8 @@ windows f = do this = W.view n ws Just l = fmap fst $ M.lookup n fls flt = filter (flip M.member (W.floating ws)) (W.index this) - tiled = W.filter (not . flip M.member (W.floating ws)) . W.stack . W.workspace . W.current $ this + tiled = (W.stack . W.workspace . W.current $ this) + >>= W.filter (not . flip M.member (W.floating ws)) (Rectangle sx sy sw sh) = genericIndex xinesc (W.screen w) (gt,gb,gl,gr) = genericIndex gaps (W.screen w) viewrect = Rectangle (sx + fromIntegral gl) (sy + fromIntegral gt) |