mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-30 03:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix moving out of a tabbed/stacked workspace

Browse source
This commit is contained in:
Brian Ashworth 2018-05-28 21:37:29 -04:00
parent a66fd74a54
commit 103a302fa4
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/tree/layout.c
View file

@ -313,15 +313,24 @@ static void move_out_of_tabs_stacks(struct sway_container *container,
struct sway_container *current, enum movement_direction move_dir, struct sway_container *current, enum movement_direction move_dir,
int offs) { int offs) {
wlr_log(L_DEBUG, "Moving out of tab/stack into a split"); wlr_log(L_DEBUG, "Moving out of tab/stack into a split");
bool is_workspace = current->parent->type == C_WORKSPACE;
struct sway_container *old_parent = current->parent->parent; struct sway_container *old_parent = current->parent->parent;
struct sway_container *new_parent = container_split(current->parent, struct sway_container *new_parent = container_split(current->parent,
move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT); move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT);
container_insert_child(new_parent, container, offs < 0 ? 0 : 1); if (is_workspace) {
container_reap_empty_recursive(new_parent->parent); container_insert_child(new_parent->parent, container, offs < 0 ? 0 : 1);
container_flatten(new_parent->parent); } else {
wl_signal_emit(&current->events.reparent, old_parent); container_insert_child(new_parent, container, offs < 0 ? 0 : 1);
container_reap_empty_recursive(new_parent->parent);
container_flatten(new_parent->parent);
}
wl_signal_emit(&container->events.reparent, old_parent);
container_create_notify(new_parent); container_create_notify(new_parent);
arrange_children_of(new_parent); if (is_workspace) {
arrange_workspace(new_parent->parent);
} else {
arrange_children_of(new_parent);
}
} }
void container_move(struct sway_container *container, void container_move(struct sway_container *container,