nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-09-18 17:44:00 +01:00
parent 46409ad656 11ab7cf32a
commit 05c0a8985b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tree.c
View File

@ -220,12 +220,13 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) {
if (was_mapped || con == focused) { if (was_mapped || con == focused) {
if ((kill_window != DONT_KILL_WINDOW) || !dont_kill_parent || con == focused) { if ((kill_window != DONT_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 */
if (next->type == CT_DOCKAREA) { if (next->type == CT_DOCKAREA) {
/* Instead of focusing the dockarea, we need to restore focus to the workspace */ /* Instead of focusing the dockarea, we need to restore focus to the workspace */
con_focus(con_descend_focused(output_get_content(next->parent))); con_focus(con_descend_focused(output_get_content(next->parent)));
} else { } else {
con_focus(next); if (con != focused)
DLOG("not changing focus, the container was not focused before\n");
else con_focus(next);
} }
} }
else { else {