Bugfix: don’t focus the dockarea when closing a dock client

This commit is contained in:
Michael Stapelberg 2011-03-03 14:03:06 +01:00
parent e0647b7fc2
commit 77640da9e7
1 changed files with 6 additions and 1 deletions

View File

@ -184,7 +184,12 @@ void tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
if (kill_window || !dont_kill_parent || con == focused) { if (kill_window || !dont_kill_parent || con == focused) {
DLOG("focusing %p / %s\n", next, next->name); DLOG("focusing %p / %s\n", next, next->name);
/* TODO: check if the container (or one of its children) was focused */ /* TODO: check if the container (or one of its children) was focused */
con_focus(next); if (next->type == CT_DOCKAREA) {
/* Instead of focusing the dockarea, we need to restore focus to the workspace */
con_focus(con_descend_focused(output_get_content(next->parent)));
} else {
con_focus(next);
}
} }
else { else {
DLOG("not focusing because we're not killing anybody"); DLOG("not focusing because we're not killing anybody");