Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg
2011-08-27 13:03:20 +02:00
2 changed files with 23 additions and 2 deletions

View File

@ -17,7 +17,7 @@
extern xcb_connection_t *conn;
void floating_enable(Con *con, bool automatic) {
bool set_focus = true;
bool set_focus = (con == focused);
if (con_is_floating(con)) {
LOG("Container is already in floating mode, not doing anything.\n");
@ -174,7 +174,6 @@ void floating_enable(Con *con, bool automatic) {
render_con(nc, false);
render_con(con, false);
// TODO: dont influence focus handling when Con was not focused before.
if (set_focus)
con_focus(con);