diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-16 10:22:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-16 10:22:01 -0400 |
| commit | 456b91600d73edb3187c170eb6720b1c3212351c (patch) | |
| tree | 318401a7a3c0e8f778d45e4ea26f5517e05191fa /sway/desktop | |
| parent | 5192f74be132a563e30b240415b385e67cbacadb (diff) | |
| parent | f6e218a64371b02afdf6b7812a52d70b13635ef3 (diff) | |
| download | sway-456b91600d73edb3187c170eb6720b1c3212351c.tar.xz | |
Merge pull request #2637 from RyanDwyer/fix-tabbed-workspace-shenanigans
Make seat_get_active_child ignore floating children
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/output.c | 2 | ||||
| -rw-r--r-- | sway/desktop/transaction.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index a5db15cd..cfb5a710 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -232,7 +232,7 @@ static void scale_box(struct wlr_box *box, float scale) { struct sway_workspace *output_get_active_workspace(struct sway_output *output) { struct sway_seat *seat = input_manager_current_seat(input_manager); - struct sway_node *focus = seat_get_active_child(seat, &output->node); + struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node); if (!focus) { return output->workspaces->items[0]; } diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index b4eec933..d747e279 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -176,7 +176,8 @@ static void copy_container_state(struct sway_container *container, state->focused = seat_get_focus(seat) == &container->node; if (!container->view) { - struct sway_node *focus = seat_get_active_child(seat, &container->node); + struct sway_node *focus = + seat_get_active_tiling_child(seat, &container->node); state->focused_inactive_child = focus ? focus->sway_container : NULL; } } |