Replace the discrete 'split' Con property with a simple function.

[i3/i3] / src / tree.c

diff --git a/src/tree.c b/src/tree.c
index 657c8bfa757d8fbd1ed663defb705ba31b60cffc..d4794e4d7e2f6ce4cf853c9979c6a6fb4710f780 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -382,7 +382,6 @@ void tree_split(Con *con, orientation_t orientation) {
     TAILQ_REPLACE(&(parent->focus_head), con, new, focused);
     new->parent = parent;
     new->layout = (orientation == HORIZ) ? L_SPLITH : L_SPLITV;
-    new->split = true;
 
     /* 3: swap 'percent' (resize factor) */
     new->percent = con->percent;
@@ -529,7 +528,6 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap)
             if (!next)
                 return false;
 
-            floating_raise_con(next);
             con_focus(con_descend_focused(next));
             return true;
         } else {
@@ -627,8 +625,8 @@ void tree_flatten(Con *con) {
 
     /* The child must have a different orientation than the con but the same as
      * the con’s parent to be redundant */
-    if (!con->split ||
-        !child->split ||
+    if (!con_is_split(con) ||
+        !con_is_split(child) ||
         con_orientation(con) == con_orientation(child) ||
         con_orientation(child) != con_orientation(parent))
         goto recurse;