}
}
+ 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);
- floating_maybe_reassign_ws(nc);
+ /* Check if we need to re-assign it to a different workspace because of its
+ * coordinates and exit if that was done successfully. */
+ if (floating_maybe_reassign_ws(nc))
+ return;
+
+ /* Sanitize coordinates: Check if they are on any output */
+ if (get_output_containing(nc->rect.x, nc->rect.y) != NULL)
+ return;
+
+ ELOG("No output found at destination coordinates, centering floating window on current ws\n");
+ Con *ws = nc->parent;
+ nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
+ nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
}
void floating_disable(Con *con, bool automatic) {
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));
con->rect.y = old_rect->y + (new_y - event->root_y);
render_con(con, false);
- x_push_node(con, true);
+ x_push_node(con);
xcb_flush(conn);
/* Check if we cross workspace boundaries while moving */
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 };