From: Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com>
Date: Thu, 27 Jan 2011 22:58:49 +0000 (-0200)
Subject: Don't mess with the percentages in tree_flatten.
X-Git-Tag: tree-pr2~89
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b29af954f6299e3636d3027fce749b6365e5d9b9;p=i3%2Fi3

Don't mess with the percentages in tree_flatten.
---

diff --git a/src/tree.c b/src/tree.c
index 98f50162..aa79587b 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -438,7 +438,7 @@ void tree_move(char way, orientation_t orientation) {
     /* If we have no tiling cons (when moving a window out of a floating con to
      * an otherwise empty workspace for example), we just attach the window to
      * the workspace. */
-    bool fix_percent = 0;
+    bool fix_percent = false;
     if (TAILQ_EMPTY(&(parent->nodes_head))) {
         con_detach(focused);
         con_fix_percent(focused->parent);
@@ -473,7 +473,7 @@ void tree_move(char way, orientation_t orientation) {
             if (focused->parent != next->parent) {
                 con_fix_percent(focused->parent);
                 focused->parent = next->parent;
-                fix_percent = 1;
+                fix_percent = true;
             }
 
             TAILQ_INSERT_AFTER(&(next->parent->nodes_head), next, focused, nodes);
@@ -503,7 +503,7 @@ void tree_move(char way, orientation_t orientation) {
             if (focused->parent != next->parent) {
                 con_fix_percent(focused->parent);
                 focused->parent = next->parent;
-                fix_percent = 1;
+                fix_percent = true;
             }
 
             /* After going down in the tree, we insert the container *after*
@@ -597,6 +597,7 @@ void tree_flatten(Con *con) {
         TAILQ_INSERT_BEFORE(con, current, nodes);
         DLOG("attaching to focus list\n");
         TAILQ_INSERT_TAIL(&(parent->focus_head), current, focused);
+        current->percent = con->percent;
     }
     DLOG("re-attached all\n");