Merge pull request #2637 from RyanDwyer/fix-tabbed-workspace-shenanigans

Make seat_get_active_child ignore floating children

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;
         }
 }