diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 16:09:27 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 16:09:27 -0400 |
| commit | d434da563239c43c5fe417ce83b23b417f2ab635 (patch) | |
| tree | e154daaf43c42d11c5afb8b7739ae6b52dd01215 /sway/tree/container.c | |
| parent | d070244362f7d34bc15418154e52f8c968fbad41 (diff) | |
| parent | 0c0cc79282b5ce29616893977aca629f90521988 (diff) | |
Merge branch 'wlroots' into split-containers
Diffstat (limited to 'sway/tree/container.c')
| -rw-r--r-- | sway/tree/container.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 9205d929..4db93ce8 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -89,8 +89,8 @@ static struct sway_container *_container_destroy(struct sway_container *cont) { // container_remove_child, which removes child from this container while (cont->children != NULL && cont->children->length != 0) { struct sway_container *child = cont->children->items[0]; + container_remove_child(child); container_destroy(child); - list_del(cont->children, 0); } } if (cont->marks) { @@ -172,7 +172,7 @@ struct sway_container *container_output_create( struct sway_seat *seat = NULL; wl_list_for_each(seat, &input_manager->seats, link) { if (!seat->has_focus) { - sway_seat_set_focus(seat, ws); + seat_set_focus(seat, ws); } } |