applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Stapelberg 2011-09-18 17:02:52 +01:00
commit 46409ad656
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/con.c
View File

@ -613,10 +613,19 @@ void con_move_to_workspace(Con *con, Con *workspace, bool fix_coordinates, bool
* to the coordinate space of the correct output */ * to the coordinate space of the correct output */
if (fix_coordinates && con->type == CT_FLOATING_CON) { if (fix_coordinates && con->type == CT_FLOATING_CON) {
DLOG("Floating window, fixing coordinates\n"); DLOG("Floating window, fixing coordinates\n");
/* First we get the x/y coordinates relative to the x/y coordinates
* of the output on which the window is on */
uint32_t rel_x = (con->rect.x - source_output->rect.x); uint32_t rel_x = (con->rect.x - source_output->rect.x);
uint32_t rel_y = (con->rect.y - source_output->rect.y); uint32_t rel_y = (con->rect.y - source_output->rect.y);
con->rect.x = dest_output->rect.x + rel_x; /* Then we calculate a fraction, for example 0.63 for a window
con->rect.y = dest_output->rect.y + rel_y; * which is at y = 1212 of a 1920 px high output */
double fraction_x = ((double)rel_x / source_output->rect.width);
double fraction_y = ((double)rel_y / source_output->rect.height);
DLOG("rel_x = %d, rel_y = %d, fraction_x = %f, fraction_y = %f, output->w = %d, output->h = %d\n",
rel_x, rel_y, fraction_x, fraction_y, source_output->rect.width, source_output->rect.height);
con->rect.x = dest_output->rect.x + (fraction_x * dest_output->rect.width);
con->rect.y = dest_output->rect.y + (fraction_y * dest_output->rect.height);
DLOG("Resulting coordinates: x = %d, y = %d\n", con->rect.x, con->rect.y);
} else DLOG("Not fixing coordinates, fix_coordinates flag = %d\n", fix_coordinates); } else DLOG("Not fixing coordinates, fix_coordinates flag = %d\n", fix_coordinates);
/* If moving to a visible workspace, call show so it can be considered /* If moving to a visible workspace, call show so it can be considered