aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-16 22:01:54 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-16 22:01:54 +1000
commitf6e218a64371b02afdf6b7812a52d70b13635ef3 (patch)
tree7348bf536a2bfbdedabe28d00a3c49b1bfcb559a /sway/commands
parentMake seat_get_active_child ignore floating children (diff)
downloadsway-f6e218a64371b02afdf6b7812a52d70b13635ef3.tar.gz
sway-f6e218a64371b02afdf6b7812a52d70b13635ef3.tar.zst
sway-f6e218a64371b02afdf6b7812a52d70b13635ef3.zip
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.c2
-rw-r--r--sway/commands/move.c2
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) {
261 } 261 }
262 262
263 if (direction == MOVE_CHILD) { 263 if (direction == MOVE_CHILD) {
264 struct sway_node *focus = seat_get_active_child(seat, node); 264 struct sway_node *focus = seat_get_active_tiling_child(seat, node);
265 if (focus) { 265 if (focus) {
266 seat_set_focus(seat, focus); 266 seat_set_focus(seat, focus);
267 cursor_send_pointer_motion(seat->cursor, 0, true); 267 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(
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