nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-01-29 18:02:48 +00:00
parent 29aa28b623 714c8fcbe7
commit 36464c7a54
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/randr.c
View File

@ -758,7 +758,8 @@ void randr_query_outputs() {
DLOG("next = %p\n", next); DLOG("next = %p\n", next);
} }
/* 2: iterate through workspaces and re-assign them */ /* 2: iterate through workspaces and re-assign them, fixing the coordinates
* of floating containers as we go */
Con *current; Con *current;
Con *old_content = output_get_content(output->con); Con *old_content = output_get_content(output->con);
while (!TAILQ_EMPTY(&(old_content->nodes_head))) { while (!TAILQ_EMPTY(&(old_content->nodes_head))) {
@ -767,6 +768,10 @@ void randr_query_outputs() {
con_detach(current); con_detach(current);
DLOG("Re-attaching current = %p / %s\n", current, current->name); DLOG("Re-attaching current = %p / %s\n", current, current->name);
con_attach(current, first_content, false); con_attach(current, first_content, false);
DLOG("Fixing the coordinates of floating containers\n");
Con *floating_con;
TAILQ_FOREACH(floating_con, &(current->floating_head), floating_windows)
floating_fix_coordinates(floating_con, &(old_content->rect), &(first_content->rect));
DLOG("Done, next\n"); DLOG("Done, next\n");
} }
DLOG("re-attached all workspaces\n"); DLOG("re-attached all workspaces\n");