From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 6 Mar 2016 15:17:27 +0000 (+0100)
Subject: Merge branch 'next' into master
X-Git-Tag: 4.14.1~78
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=988cc3ccaf59a0c25d9df47337bb9bd8826f6b31;p=i3%2Fi3

Merge branch 'next' into master
---

988cc3ccaf59a0c25d9df47337bb9bd8826f6b31
diff --cc debian/changelog
index aaa7e54e,1cb2e681..8857ad01
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
+ i3-wm (4.11.1-1) unstable; urgency=medium
+ 
 -  * UNRELEASED
++  * New upstream release.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Wed, 30 Sep 2015 09:03:26 +0200
+ 
  i3-wm (4.11-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc src/commands.c
index 78dc2159,0faf2775..c9580c28
--- a/src/commands.c
+++ b/src/commands.c
@@@ -1180,8 -1151,23 +1151,26 @@@ void cmd_split(I3_CMD, const char *dire
              continue;
          }
  
+         DLOG("matching: %p / %s\n", current->con, current->con->name);
+         if (direction[0] == 't') {
+             layout_t current_layout;
+             if (current->con->type == CT_WORKSPACE) {
+                 current_layout = current->con->layout;
+             } else {
+                 current_layout = current->con->parent->layout;
+             }
+             /* toggling split orientation */
+             if (current_layout == L_SPLITH) {
+                 tree_split(current->con, VERT);
+             } else {
+                 tree_split(current->con, HORIZ);
+             }
+         } else {
+             tree_split(current->con, (direction[0] == 'v' ? VERT : HORIZ));
+         }
++
 +        DLOG("matching: %p / %s\n", current->con, current->con->name);
 +        tree_split(current->con, (direction[0] == 'v' ? VERT : HORIZ));
      }
  
      cmd_output->needs_tree_render = true;