Merge branch 'master' into next

[i3/i3] / src / commands.c

diff --git a/src/commands.c b/src/commands.c
index 7ad3aba013d0c7cbe9900ea4cf8b50af99ad4dab..c0f1d1874a00ff544436ab5b7858f1673437db15 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -779,6 +779,12 @@ void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resiz
 
     owindow *current;
     TAILQ_FOREACH(current, &owindows, owindows) {
+        /* Don't handle dock windows (issue #1201) */
+        if (current->con->window->dock) {
+            DLOG("This is a dock window. Not resizing (con = %p)\n)", current->con);
+            continue;
+        }
+
         Con *floating_con;
         if ((floating_con = con_inside_floating(current->con))) {
             cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, px);