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/move.c | |
| parent | Merge pull request #2641 from marienz/inhibit-crash (diff) | |
| parent | Rename seat_get_active_child to seat_get_active_tiling_child (diff) | |
| download | sway-456b91600d73edb3187c170eb6720b1c3212351c.tar.gz sway-456b91600d73edb3187c170eb6720b1c3212351c.tar.zst sway-456b91600d73edb3187c170eb6720b1c3212351c.zip | |
Merge pull request #2637 from RyanDwyer/fix-tabbed-workspace-shenanigans
Make seat_get_active_child ignore floating children
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 2 |
1 files changed, 1 insertions, 1 deletions
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( | |||
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | wlr_log(WLR_DEBUG, "Reparenting container (perpendicular)"); | 151 | wlr_log(WLR_DEBUG, "Reparenting container (perpendicular)"); |
| 152 | struct sway_node *focus_inactive = seat_get_active_child( | 152 | struct sway_node *focus_inactive = seat_get_active_tiling_child( |
| 153 | config->handler_context.seat, &destination->node); | 153 | config->handler_context.seat, &destination->node); |
| 154 | if (!focus_inactive || focus_inactive == &destination->node) { | 154 | if (!focus_inactive || focus_inactive == &destination->node) { |
| 155 | // The container has no children | 155 | // The container has no children |