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/commands | |
| 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/commands')
| -rw-r--r-- | sway/commands/focus.c | 2 | ||||
| -rw-r--r-- | sway/commands/move.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c index d63077e6..44adb95b 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -261,7 +261,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) { } if (direction == MOVE_CHILD) { - struct sway_node *focus = seat_get_active_child(seat, node); + struct sway_node *focus = seat_get_active_tiling_child(seat, node); if (focus) { seat_set_focus(seat, focus); cursor_send_pointer_motion(seat->cursor, 0, true); diff --git a/sway/commands/move.c b/sway/commands/move.c index 8f0ef230..42b305d1 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -149,7 +149,7 @@ static void container_move_to_container_from_direction( } wlr_log(WLR_DEBUG, "Reparenting container (perpendicular)"); - struct sway_node *focus_inactive = seat_get_active_child( + struct sway_node *focus_inactive = seat_get_active_tiling_child( config->handler_context.seat, &destination->node); if (!focus_inactive || focus_inactive == &destination->node) { // The container has no children |