diff options
| author | emersion <[email protected]> | 2018-09-06 12:56:21 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-09-06 12:56:21 +0200 |
| commit | 8e2a2e5ca457c73a62857bd9860c8e34d07ab78e (patch) | |
| tree | ff0b87cfe7158e00501e9dc8a571e3b8cce2dbe0 /sway/commands/swap.c | |
| parent | 6ab38ba098cbdbc88dd0460dcd24b24c2c548d07 (diff) | |
| parent | 908095ef9a479cafaf7d815824f243b4576ff1bb (diff) | |
Merge pull request #2589 from RyanDwyer/seat-set-focus-type
Introduce seat_set_focus_container and seat_set_focus_workspace
Diffstat (limited to 'sway/commands/swap.c')
| -rw-r--r-- | sway/commands/swap.c | 10 |
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, if (workspace_is_visible(ws2)) { seat_set_focus_warp(seat, &con2->node, false, true); } - seat_set_focus(seat, ws1 != ws2 ? &con2->node : &con1->node); + seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); } else if (focus == con2 && (layout1 == L_TABBED || layout1 == L_STACKED)) { if (workspace_is_visible(ws1)) { seat_set_focus_warp(seat, &con1->node, false, true); } - seat_set_focus(seat, ws1 != ws2 ? &con1->node : &con2->node); + seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); } else if (ws1 != ws2) { - seat_set_focus(seat, focus == con1 ? &con2->node : &con1->node); + seat_set_focus_container(seat, focus == con1 ? con2 : con1); } else { - seat_set_focus(seat, &focus->node); + seat_set_focus_container(seat, focus); } } else { - seat_set_focus(seat, &focus->node); + seat_set_focus_container(seat, focus); } } |