Added config key for default orientation of containers (new_container_orientation...

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index 6aea7a91636ca4dd6cb5cf8a01bf74238a50defe..ef500bf6d2e7f902134cded7990ff1e7e2115cd7 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -94,8 +94,7 @@ void floating_enable(Con *con, bool automatic) {
     free(name);
 
     /* find the height for the decorations */
-    i3Font *font = load_font(conn, config.font);
-    int deco_height = font->height + 5;
+    int deco_height = config.font.height + 5;
 
     DLOG("Original rect: (%d, %d) with %d x %d\n", con->rect.x, con->rect.y, con->rect.width, con->rect.height);
     Rect zero = { 0, 0, 0, 0 };
@@ -176,7 +175,8 @@ void floating_disable(Con *con, bool automatic) {
 
     /* 3: re-attach to the parent of the currently focused con on the workspace
      * this floating con was on */
-    Con *focused = con_descend_focused(con_get_workspace(con));
+    Con *focused = con_descend_tiling_focused(con_get_workspace(con));
+
     /* if there is no other container on this workspace, focused will be the
      * workspace itself */
     if (focused->type == CT_WORKSPACE)