Merge pull request #2977 from orestisf1993/issue-1627

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index e0901443dc0a1ccb086948868c28d3c282d0841b..b6b0da2c6f48318b283e3a94479f172797317065 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -243,6 +243,13 @@ void con_focus(Con *con) {
         workspace_update_urgent_flag(con_get_workspace(con));
         ipc_send_window_event("urgent", con);
     }
+
+    /* Focusing a container with a floating parent should raise it to the top. Since
+     * con_focus is called recursively for each parent we don't need to use
+     * con_inside_floating(). */
+    if (con->type == CT_FLOATING_CON) {
+        floating_raise_con(con);
+    }
 }
 
 /*