diff options
Diffstat (limited to 'sway/tree/layout.c')
| -rw-r--r-- | sway/tree/layout.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 79e7c87e..b54dc2fe 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -35,6 +35,7 @@ void layout_init(void) { root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); 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_signal_init(&root_container.sway_root->events.new_container); @@ -874,11 +875,10 @@ struct sway_container *container_split(struct sway_container *child, cont->x = child->x; cont->y = child->y; + struct sway_seat *seat = input_manager_get_default_seat(input_manager); + bool set_focus = (seat_get_focus(seat) == child); if (child->type == C_WORKSPACE) { - struct sway_seat *seat = input_manager_get_default_seat(input_manager); struct sway_container *workspace = child; - bool set_focus = (seat_get_focus(seat) == workspace); - while (workspace->children->length) { struct sway_container *ws_child = workspace->children->items[0]; container_remove_child(ws_child); @@ -890,10 +890,6 @@ struct sway_container *container_split(struct sway_container *child, enum sway_container_layout old_layout = workspace->layout; workspace->layout = layout; cont->layout = old_layout; - - if (set_focus) { - seat_set_focus(seat, cont); - } } else { struct sway_container *old_parent = child->parent; cont->layout = layout; @@ -902,6 +898,11 @@ struct sway_container *container_split(struct sway_container *child, wl_signal_emit(&child->events.reparent, old_parent); } + if (set_focus) { + seat_set_focus(seat, cont); + seat_set_focus(seat, child); + } + container_notify_subtree_changed(cont); return cont; |