Merge branch 'master' into next

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 3cf22f61ead571e30bc0b1bc2362aeeff5e1b1d6..63b18b280e8837b471b437d2e245857071e0ad50 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -135,6 +135,7 @@ struct deco_render_params {
     Rect con_deco_rect;
     uint32_t background;
     bool con_is_leaf;
+    orientation_t parent_orientation;
 };
 
 /**
@@ -440,8 +441,6 @@ struct Assignment {
  */
 struct Con {
     bool mapped;
-    /** whether this is a split container or not */
-    bool split;
     enum {
         CT_ROOT = 0,
         CT_OUTPUT = 1,