diff options
| author |  emersion <contact@emersion.fr> | 2018-08-02 08:11:10 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-02 08:11:10 +0100 |
| commit | 47bf4ed0cbf104d09bba7f39acbf2ceb84c2c694 (patch) | |
| tree | 8f0085c1829ab97a920acd9d5116732779177631 /sway/commands/move.c | |
| parent | Correctly track saved surfaces during multiple transactions (diff) | |
| parent | Merge pull request #2391 from RyanDwyer/fix-popups-v2 (diff) | |
| download | sway-47bf4ed0cbf104d09bba7f39acbf2ceb84c2c694.tar.gz sway-47bf4ed0cbf104d09bba7f39acbf2ceb84c2c694.tar.zst sway-47bf4ed0cbf104d09bba7f39acbf2ceb84c2c694.zip | |
Merge branch 'master' into fix-resize-wiggle
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 1aae3838..46ebcd83 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
| @@ -98,7 +98,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, | |||
| 98 | container_move_to(current, destination); | 98 | container_move_to(current, destination); |
| 99 | struct sway_container *focus = seat_get_focus_inactive( | 99 | struct sway_container *focus = seat_get_focus_inactive( |
| 100 | config->handler_context.seat, old_parent); | 100 | config->handler_context.seat, old_parent); |
| 101 | seat_set_focus(config->handler_context.seat, focus); | 101 | seat_set_focus_warp(config->handler_context.seat, focus, true, false); |
| 102 | container_reap_empty(old_parent); | 102 | container_reap_empty(old_parent); |
| 103 | container_reap_empty(destination->parent); | 103 | container_reap_empty(destination->parent); |
| 104 | 104 | ||
| @@ -135,7 +135,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, | |||
| 135 | struct sway_container *old_parent = current->parent; | 135 | struct sway_container *old_parent = current->parent; |
| 136 | struct sway_container *old_ws = container_parent(current, C_WORKSPACE); | 136 | struct sway_container *old_ws = container_parent(current, C_WORKSPACE); |
| 137 | container_move_to(current, focus); | 137 | container_move_to(current, focus); |
| 138 | seat_set_focus(config->handler_context.seat, old_parent); | 138 | seat_set_focus_warp(config->handler_context.seat, old_parent, true, false); |
| 139 | container_reap_empty(old_parent); | 139 | container_reap_empty(old_parent); |
| 140 | container_reap_empty(focus->parent); | 140 | container_reap_empty(focus->parent); |
| 141 | 141 | ||