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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Stapelberg
2013-06-29 20:28:07 +02:00
parent 6582da9939 e53b410894
commit 78e99440f6
2 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/floating.c
View File

@ -315,6 +315,8 @@ void floating_disable(Con *con, bool automatic) {
return;
}
const bool set_focus = (con == focused);
Con *ws = con_get_workspace(con);
/* 1: detach from parent container */
@ -344,8 +346,9 @@ void floating_disable(Con *con, bool automatic) {
con_attach(con, con->parent, false);
con_fix_percent(con->parent);
// TODO: don’t influence focus handling when Con was not focused before.
con_focus(con);
if (set_focus)
con_focus(con);
}
/*