From f6e218a64371b02afdf6b7812a52d70b13635ef3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 16 Sep 2018 22:01:54 +1000 Subject: Rename seat_get_active_child to seat_get_active_tiling_child Also renames container to con in one function to prevent ugly line wrapping. --- sway/commands/focus.c | 2 +- sway/commands/move.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/commands') 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 -- cgit v1.2.3