X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffloating.c;h=2f3f9bac3413d53b9f4bfb457e21104df29f951a;hb=d3e458bc7892280798eafb281a5be7106babc14c;hp=23f8a60a682a0efb2763957483b08f17c30a0b4b;hpb=d28008aa639d1f971ee5874a6e20ddf2c9c8bfa9;p=i3%2Fi3

diff --git a/src/floating.c b/src/floating.c
index 23f8a60a..2f3f9bac 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -85,7 +85,7 @@ void floating_enable(Con *con, bool automatic) {
     /* check if the parent container is empty and close it if so */
     if ((con->parent->type == CT_CON || con->parent->type == CT_FLOATING_CON) && con_num_children(con->parent) == 0) {
         DLOG("Old container empty after setting this child to floating, closing\n");
-        tree_close(con->parent, false, false);
+        tree_close(con->parent, DONT_KILL_WINDOW, false);
     }
 
     char *name;
@@ -147,12 +147,13 @@ void floating_enable(Con *con, bool automatic) {
         }
     }
 
+    TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
+    TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
+
     /* render the cons to get initial window_rect correct */
     render_con(nc, false);
     render_con(con, false);
 
-    TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
-    TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
     // TODO: don’t influence focus handling when Con was not focused before.
     if (set_focus)
         con_focus(con);
@@ -185,7 +186,7 @@ void floating_disable(Con *con, bool automatic) {
     /* 2: kill parent container */
     TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
     TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
-    tree_close(con->parent, false, false);
+    tree_close(con->parent, DONT_KILL_WINDOW, false);
 
     /* 3: re-attach to the parent of the currently focused con on the workspace
      * this floating con was on */
@@ -262,7 +263,7 @@ bool floating_maybe_reassign_ws(Con *con) {
     DLOG("Need to re-assign!\n");
 
     Con *content = output_get_content(output->con);
-    Con *ws = TAILQ_FIRST(&(content->nodes_head));
+    Con *ws = TAILQ_FIRST(&(content->focus_head));
     DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name);
     con_move_to_workspace(con, ws);
     con_focus(con_descend_focused(con));
@@ -380,7 +381,7 @@ void floating_resize_window(Con *con, bool proportional,
 
     if (event->event_y <= (con->rect.height / 2))
         corner |= BORDER_TOP;
-    else corner |= BORDER_RIGHT;
+    else corner |= BORDER_BOTTOM;
 
     struct resize_window_callback_params params = { corner, proportional, event };