koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor code for removing children from a con

Browse Source 
Let’s see how this callback stuff will work out. If it doesn’t work out well,
we will remove it.
This commit is contained in:
Michael Stapelberg
2011-02-14 18:08:36 +01:00
parent a5e075c154
commit 28dd226259
4 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tree.c
View File

@ -190,14 +190,8 @@ void tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
}
/* check if the parent container is empty now and close it */
if (!dont_kill_parent &&
parent->type != CT_WORKSPACE &&
TAILQ_EMPTY(&(parent->nodes_head))) {
DLOG("Closing empty parent container\n");
/* TODO: check if this container would swallow any other client and
* don’t close it automatically. */
tree_close(parent, false, false);
}
if (!dont_kill_parent)
CALL(parent, on_remove_child);
}
/*
@ -504,6 +498,8 @@ void tree_move(char way, orientation_t orientation) {
fix_percent = true;
}
CALL(con->parent, on_remove_child);
TAILQ_INSERT_AFTER(&(next->parent->nodes_head), next, con, nodes);
TAILQ_INSERT_HEAD(&(next->parent->focus_head), con, focused);
/* TODO: don’t influence focus handling? */
@ -567,13 +563,11 @@ void tree_move(char way, orientation_t orientation) {
* container(s) would still point to the old container(s)). */
con_focus(con);
if (con_num_children(old_parent) == 0) {
DLOG("Old container empty after moving. Let's close it\n");
tree_close(old_parent, false, false);
} else if (level_changed) {
/* fix the percentages in the container we moved from */
/* fix the percentages in the container we moved from */
if (level_changed)
con_fix_percent(old_parent);
}
CALL(old_parent, on_remove_child);
tree_flatten(croot);
}