diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
| commit | 9e96cfd310c4e5dc60f07d772e60b139ff7dc448 (patch) | |
| tree | 9961c8705208b2f127133f0533bd305a6f75015e /sway/tree/layout.c | |
| parent | bb66e6d578fdc68fb33d0fde921390d74f20bb31 (diff) | |
| parent | 867fb6aedbbe4cd1c7f4817848682609e8489880 (diff) | |
| download | sway-9e96cfd310c4e5dc60f07d772e60b139ff7dc448.tar.xz | |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/tree/layout.c')
| -rw-r--r-- | sway/tree/layout.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 65b61495..3724361d 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -37,6 +37,7 @@ void layout_init(void) { root_container.sway_root->output_layout = wlr_output_layout_create(); wl_list_init(&root_container.sway_root->outputs); wl_list_init(&root_container.sway_root->xwayland_unmanaged); + wl_list_init(&root_container.sway_root->drag_icons); wl_signal_init(&root_container.sway_root->events.new_container); root_container.sway_root->output_layout_change.notify = @@ -839,6 +840,8 @@ struct sway_container *container_split(struct sway_container *child, wlr_log(L_DEBUG, "creating container %p around %p", cont, child); + remove_gaps(child); + cont->prev_layout = L_NONE; cont->width = child->width; cont->height = child->height; @@ -847,6 +850,9 @@ struct sway_container *container_split(struct sway_container *child, struct sway_seat *seat = input_manager_get_default_seat(input_manager); bool set_focus = (seat_get_focus(seat) == child); + + add_gaps(cont); + if (child->type == C_WORKSPACE) { struct sway_container *workspace = child; while (workspace->children->length) { @@ -874,7 +880,6 @@ struct sway_container *container_split(struct sway_container *child, } container_notify_subtree_changed(cont); - return cont; } |