summaryrefslogtreecommitdiffstats
path: root/sway/commands/move.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/move.c')
-rw-r--r--sway/commands/move.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index fc2f1cc1..24036f36 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -543,7 +543,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) {
543 if (new_output_last_ws && new_output_last_ws != new_workspace) { 543 if (new_output_last_ws && new_output_last_ws != new_workspace) {
544 struct sway_node *new_output_last_focus = 544 struct sway_node *new_output_last_focus =
545 seat_get_focus_inactive(seat, &new_output_last_ws->node); 545 seat_get_focus_inactive(seat, &new_output_last_ws->node);
546 seat_set_focus_warp(seat, new_output_last_focus, false, false); 546 seat_set_raw_focus(seat, new_output_last_focus);
547 } 547 }
548 548
549 // restore focus 549 // restore focus
@@ -556,7 +556,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) {
556 focus = seat_get_focus_inactive(seat, &old_ws->node); 556 focus = seat_get_focus_inactive(seat, &old_ws->node);
557 } 557 }
558 } 558 }
559 seat_set_focus_warp(seat, focus, true, false); 559 seat_set_focus(seat, focus);
560 560
561 // clean-up, destroying parents if the container was the last child 561 // clean-up, destroying parents if the container was the last child
562 if (old_parent) { 562 if (old_parent) {
@@ -593,7 +593,7 @@ static void workspace_move_to_output(struct sway_workspace *workspace,
593 char *ws_name = workspace_next_name(old_output->wlr_output->name); 593 char *ws_name = workspace_next_name(old_output->wlr_output->name);
594 struct sway_workspace *ws = workspace_create(old_output, ws_name); 594 struct sway_workspace *ws = workspace_create(old_output, ws_name);
595 free(ws_name); 595 free(ws_name);
596 seat_set_focus_workspace(seat, ws); 596 seat_set_raw_focus(seat, &ws->node);
597 } 597 }
598 598
599 workspace_consider_destroy(new_output_old_ws); 599 workspace_consider_destroy(new_output_old_ws);
@@ -704,7 +704,7 @@ static struct cmd_results *cmd_move_in_direction(
704 } 704 }
705 705
706 // Hack to re-focus container 706 // Hack to re-focus container
707 seat_set_focus_workspace(config->handler_context.seat, new_ws); 707 seat_set_raw_focus(config->handler_context.seat, &new_ws->node);
708 seat_set_focus_container(config->handler_context.seat, container); 708 seat_set_focus_container(config->handler_context.seat, container);
709 709
710 if (old_ws != new_ws) { 710 if (old_ws != new_ws) {