mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed split

Browse source
This commit is contained in:
taiyu 2015-08-15 11:19:44 -07:00
parent f3a970e24e
commit 9bb2788768
2 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sway/container.c
View file

@ -26,6 +26,9 @@ static void free_swayc(swayc_t *c) {
list_free(c->children);
}
if (c->parent) {
if (c->parent->focused == c) {
c->parent->focused = NULL;
}
remove_child(c->parent, c);
}
free(c);
@ -88,9 +91,28 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
cont->y = child->y;
cont->visible = child->visible;
swayc_t *parent = replace_child(child, cont);
if (parent) {
add_child(cont, child);
/* Container inherits all of workspaces children, layout and whatnot */
if (child->type == C_WORKSPACE) {
swayc_t *workspace = child;
//reorder focus
cont->focused = workspace->focused;
workspace->focused = cont;
//Swap children
list_t *tmp_list = workspace->children;
workspace->children = cont->children;
cont->children = tmp_list;
//add container to workspace chidren
add_child(workspace, cont);
//give them proper layouts
cont->layout = workspace->layout;
workspace->layout = layout;
}
//Or is built around container
else {
swayc_t *parent = replace_child(child, cont);
if (parent) {
add_child(cont, child);
}
}
return cont;
}
@ -152,9 +174,6 @@ swayc_t *destroy_container(swayc_t *container) {
swayc_t *parent = container->parent;
free_swayc(container);
if (parent->focused == container) {
parent->focused = NULL;
}
container = parent;
}
return container;
@ -169,9 +188,6 @@ swayc_t *destroy_view(swayc_t *view) {
swayc_t *parent = view->parent;
free_swayc(view);
if (parent->focused == view) {
parent->focused = NULL;
}
//Destroy empty containers
if (parent->type == C_CONTAINER) {
return destroy_container(parent);