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/desktop | |
parent | Make seat_get_active_child ignore floating children (diff) | |
download | sway-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/desktop')
-rw-r--r-- | sway/desktop/output.c | 2 | ||||
-rw-r--r-- | sway/desktop/transaction.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index a5db15cd..cfb5a710 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -232,7 +232,7 @@ static void scale_box(struct wlr_box *box, float scale) { | |||
232 | 232 | ||
233 | struct sway_workspace *output_get_active_workspace(struct sway_output *output) { | 233 | struct sway_workspace *output_get_active_workspace(struct sway_output *output) { |
234 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 234 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
235 | struct sway_node *focus = seat_get_active_child(seat, &output->node); | 235 | struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node); |
236 | if (!focus) { | 236 | if (!focus) { |
237 | return output->workspaces->items[0]; | 237 | return output->workspaces->items[0]; |
238 | } | 238 | } |
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index b4eec933..d747e279 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c | |||
@@ -176,7 +176,8 @@ static void copy_container_state(struct sway_container *container, | |||
176 | state->focused = seat_get_focus(seat) == &container->node; | 176 | state->focused = seat_get_focus(seat) == &container->node; |
177 | 177 | ||
178 | if (!container->view) { | 178 | if (!container->view) { |
179 | struct sway_node *focus = seat_get_active_child(seat, &container->node); | 179 | struct sway_node *focus = |
180 | seat_get_active_tiling_child(seat, &container->node); | ||
180 | state->focused_inactive_child = focus ? focus->sway_container : NULL; | 181 | state->focused_inactive_child = focus ? focus->sway_container : NULL; |
181 | } | 182 | } |
182 | } | 183 | } |