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

Bugfix: Don’t use ->old_parent for floating cons (Thanks eelvex)

Browse Source 
Instead, we attach them to their workspace when toggling back to tiling. This
makes more sense; afterall, floating clients are always directly below a
CT_WORKSPACE container.
This commit is contained in:
Michael Stapelberg
2011-01-08 00:44:03 +01:00
parent 0ea15ed962
commit 83f6e445a0
3 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/floating.c
View File

@ -99,7 +99,6 @@ void floating_enable(Con *con, bool automatic) {
TAILQ_INSERT_TAIL(&(nc->parent->focus_head), nc, focused);
/* 3: attach the child to the new parent container */
con->old_parent = con->parent;
con->parent = nc;
con->floating = FLOATING_USER_ON;
@ -134,8 +133,6 @@ void floating_disable(Con *con, bool automatic) {
return;
}
assert(con->old_parent != NULL);
/* 1: detach from parent container */
TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
@ -146,7 +143,7 @@ void floating_disable(Con *con, bool automatic) {
tree_close(con->parent, false, false);
/* 3: re-attach to previous parent */
con->parent = con->old_parent;
con->parent = con_get_workspace(con);
TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);