diff options
| author |  Dominique Martinet <asmadeus@codewreck.org> | 2018-11-29 00:07:57 +0900 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-11-29 00:08:43 +0900 |
| commit | 2543834172d6510b4cb61fdbc412cffa349b2220 (patch) | |
| tree | 33bf3e61ee74b9ae822ddcce14da1cc24e4962cb | |
| parent | Merge pull request #3199 from emersion/handle-subsurface-destroy (diff) | |
| download | sway-2543834172d6510b4cb61fdbc412cffa349b2220.tar.gz sway-2543834172d6510b4cb61fdbc412cffa349b2220.tar.zst sway-2543834172d6510b4cb61fdbc412cffa349b2220.zip | |
move to workspace: fix moving floating container to non-empty workspace
moving a container to a non-empty workspace will find a container to move
to in the destination workspace and call container_move_to_container,
which must not just skip floating containers
| -rw-r--r-- | sway/commands/move.c | 1 |
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; |