aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/swap.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/swap.c')
-rw-r--r--sway/commands/swap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index a0ffbda8..e7f9cbea 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -52,20 +52,20 @@ static void swap_focus(struct sway_container *con1,
52 if (workspace_is_visible(ws2)) { 52 if (workspace_is_visible(ws2)) {
53 seat_set_focus_warp(seat, &con2->node, false, true); 53 seat_set_focus_warp(seat, &con2->node, false, true);
54 } 54 }
55 seat_set_focus(seat, ws1 != ws2 ? &con2->node : &con1->node); 55 seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
56 } else if (focus == con2 && (layout1 == L_TABBED 56 } else if (focus == con2 && (layout1 == L_TABBED
57 || layout1 == L_STACKED)) { 57 || layout1 == L_STACKED)) {
58 if (workspace_is_visible(ws1)) { 58 if (workspace_is_visible(ws1)) {
59 seat_set_focus_warp(seat, &con1->node, false, true); 59 seat_set_focus_warp(seat, &con1->node, false, true);
60 } 60 }
61 seat_set_focus(seat, ws1 != ws2 ? &con1->node : &con2->node); 61 seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
62 } else if (ws1 != ws2) { 62 } else if (ws1 != ws2) {
63 seat_set_focus(seat, focus == con1 ? &con2->node : &con1->node); 63 seat_set_focus_container(seat, focus == con1 ? con2 : con1);
64 } else { 64 } else {
65 seat_set_focus(seat, &focus->node); 65 seat_set_focus_container(seat, focus);
66 } 66 }
67 } else { 67 } else {
68 seat_set_focus(seat, &focus->node); 68 seat_set_focus_container(seat, focus);
69 } 69 }
70} 70}
71 71