summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobreim <robreim@bobturf.org>2008-04-05 15:50:09 +0200
committerrobreim <robreim@bobturf.org>2008-04-05 15:50:09 +0200
commit5fc44eac6007d35178e5563338f7ec2068e49b20 (patch)
tree1c828caf346a445437978f3ab1a4f1f9ad70842a
parent3ed85a9de0dd6a9b6184ec0af0d37af29f5bf3c3 (diff)
downloadmetatile-5fc44eac6007d35178e5563338f7ec2068e49b20.tar
metatile-5fc44eac6007d35178e5563338f7ec2068e49b20.zip
floats always use current screen (with less bugs)
darcs-hash:20080405135009-d4c7e-51a1a928fa2f4adbc58b394ac00c8dd7c7112488
-rw-r--r--XMonad/Operations.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs
index 74505c3..f6c927e 100644
--- a/XMonad/Operations.hs
+++ b/XMonad/Operations.hs
@@ -57,7 +57,7 @@ manage w = whenX (not <$> isClient w) $ withDisplay $ \d -> do
let isFixedSize = sh_min_size sh /= Nothing && sh_min_size sh == sh_max_size sh
isTransient <- isJust <$> io (getTransientForHint d w)
- (sc, rr) <- floatLocation w
+ rr <- snd `fmap` floatLocation w
-- ensure that float windows don't go over the edge of the screen
let adjust (W.RationalRect x y wid h) | x + wid > 1 || y + h > 1 || x < 0 || y < 0
= W.RationalRect (0.5 - wid/2) (0.5 - h/2) wid h
@@ -65,7 +65,7 @@ manage w = whenX (not <$> isClient w) $ withDisplay $ \d -> do
f ws | isFixedSize || isTransient = W.float w (adjust rr) . W.insertUp w . W.view i $ ws
| otherwise = W.insertUp w ws
- where i = fromMaybe (W.tag . W.workspace . W.current $ ws) $ W.lookupWorkspace sc ws
+ where i = W.tag $ W.workspace $ W.current ws
mh <- asks (manageHook . config)
g <- fmap appEndo (runQuery mh w) `catchX` return id