summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-11-28 11:16:14 -0500
committerLibravatar GitHub <noreply@github.com>2018-11-28 11:16:14 -0500
commit5341e034df75f387184f85cb6a5fc0c95faf537e (patch)
treef50c34d2b2f195bfca4aa5f160685b306884ad64
parentMerge pull request #3202 from RedSoxFan/swaynag-config-warnings (diff)
parentmove to workspace: fix moving floating container to non-empty workspace (diff)
downloadsway-5341e034df75f387184f85cb6a5fc0c95faf537e.tar.gz
sway-5341e034df75f387184f85cb6a5fc0c95faf537e.tar.zst
sway-5341e034df75f387184f85cb6a5fc0c95faf537e.zip
Merge pull request #3212 from martinetd/move_floating
move to workspace: fix moving floating container to non-empty workspace
-rw-r--r--sway/commands/move.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 240b9f04..4dc547db 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -216,6 +216,7 @@ static void container_move_to_container(struct sway_container *container,
216 return; 216 return;
217 } 217 }
218 if (container_is_floating(container)) { 218 if (container_is_floating(container)) {
219 container_move_to_workspace(container, destination->workspace);
219 return; 220 return;
220 } 221 }
221 struct sway_workspace *old_workspace = container->workspace; 222 struct sway_workspace *old_workspace = container->workspace;