Merge branch 'master' into next

2014-03-15 18:05:45 +01:00
parent c5df093f5d ed158d1259
commit c23db20cb5
2 changed files with 48 additions and 0 deletions
--- 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);