diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-16 22:01:54 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-16 22:01:54 +1000 |
| commit | f6e218a64371b02afdf6b7812a52d70b13635ef3 (patch) | |
| tree | 7348bf536a2bfbdedabe28d00a3c49b1bfcb559a /sway/commands | |
| parent | 48bc15e758c37e73f3eb6ae76f4ad758148dbfb1 (diff) | |
| download | sway-f6e218a64371b02afdf6b7812a52d70b13635ef3.tar.xz | |
Rename seat_get_active_child to seat_get_active_tiling_child
Also renames container to con in one function to prevent ugly line
wrapping.
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 |