Bugfix: Assign floating cons to correct workspace when moving between monitors (Thanks dothebart)

Fixes: #371
This commit is contained in:
Michael Stapelberg 2011-04-18 18:44:39 +02:00
parent 36583ec6ee
commit 60532a90e7
1 changed files with 24 additions and 0 deletions

View File

@ -235,6 +235,30 @@ DRAGGING_CB(drag_window_callback) {
render_con(con, false); render_con(con, false);
x_push_node(con, true); x_push_node(con, true);
xcb_flush(conn); xcb_flush(conn);
/* Check if we cross workspace boundaries while moving */
Output *output = get_output_containing(
con->rect.x + (con->rect.width / 2),
con->rect.y + (con->rect.height / 2));
if (!output) {
ELOG("No output found at destination coordinates?\n");
return;
}
if (con_get_output(con) == output->con) {
DLOG("still the same ws\n");
return;
}
DLOG("Need to re-assign!\n");
Con *content = output_get_content(output->con);
Con *ws = TAILQ_FIRST(&(content->nodes_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));
tree_render();
} }
/* /*