Merge branch 'colors-userguide' into next

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index 4c4b954cfe4ee92780dee2d95ef3dd6b06c28ef6..c69a51bd4ae248afa2bd3c1ef151ac7442109af6 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -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: don’t influence focus handling when Con was not focused before.
     if (set_focus)
         con_focus(con);