From b660769fe0f306552ee92a00c60650d6f3ef06c8 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 7 Jan 2011 23:56:32 +0100 Subject: [PATCH] Bugfix: Correctly move to other workspaces when a floating window is focused on the target ws (Thanks mseed) --- src/con.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/con.c b/src/con.c index f105a279..ba42a13d 100644 --- a/src/con.c +++ b/src/con.c @@ -467,12 +467,21 @@ void con_move_to_workspace(Con *con, Con *workspace) { if (next->type != CT_WORKSPACE) next = next->parent; + /* 4: if the target container is floating, we get the workspace instead. + * Only tiling windows need to get inserted next to the current container. + * */ + Con *floatingcon = con_inside_floating(next); + if (floatingcon != NULL) { + DLOG("floatingcon, going up even further\n"); + next = floatingcon->parent; + } + DLOG("Re-attaching container to %p / %s\n", next, next->name); - /* 4: re-attach the con to the parent of this focused container */ + /* 5: re-attach the con to the parent of this focused container */ con_detach(con); con_attach(con, next, false); - /* 5: keep focus on the current workspace */ + /* 6: keep focus on the current workspace */ con_focus(focus_next); }