summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-12-28 19:05:53 +0100
committerDanny Baumann <dannybaumann@web.de>2008-12-28 19:05:53 +0100
commitf5e467906e8eecdf1616e5fc69270f55a4c87faf (patch)
tree478e3f143c839af89cec981bf9bcca57d61a0f58
parent23a626a1d63d470c33eed5c787acd79dd3b14b7b (diff)
downloadput-f5e467906e8eecdf1616e5fc69270f55a4c87faf.tar.gz
put-f5e467906e8eecdf1616e5fc69270f55a4c87faf.tar.bz2
Always respect move action.
-rw-r--r--put.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/put.c b/put.c
index a9a98d0..cea967a 100644
--- a/put.c
+++ b/put.c
@@ -694,15 +694,15 @@ putInitiateCommon (CompDisplay *d,
CompWindowTypeDockMask))
return FALSE;
+ /* don't move windows without move action */
+ if (!(w->actions & CompWindowActionMoveMask))
+ return FALSE;
+
/* only allow movement of fullscreen windows to next output */
- if (type != PutNextOutput)
+ if (type != PutNextOutput &&
+ (w->type & CompWindowTypeFullscreenMask))
{
- if (w->type & CompWindowTypeFullscreenMask)
- return FALSE;
-
- /* don't move windows without move action */
- if (!(w->actions & CompWindowActionMoveMask))
- return FALSE;
+ return FALSE;
}
/*