isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

window-x11: Simplify leftovers from the static gravity code removal

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-05-21 12:52:44 -04:00
parent d8c2933c58
commit dd243813e1
1 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/x11/window-x11.c
View File

@ -1093,46 +1093,21 @@ meta_window_x11_move_resize_internal (MetaWindow *window,
window->frame->rect.y = new_y; window->frame->rect.y = new_y;
} }
/* If frame will both move and resize, then StaticGravity client_move_x = borders.total.left;
* on the child window will kick in and implicitly move client_move_y = borders.total.top;
* the child with respect to the frame. The implicit
* move will keep the child in the same place with
* respect to the root window. If frame only moves
* or only resizes, then the child will just move along
* with the frame.
*/
/* window->rect.x, window->rect.y are relative to frame,
* remember they are the server coords
*/
new_x = borders.total.left;
new_y = borders.total.top;
client_move_x = new_x;
client_move_y = new_y;
if (client_move_x != window->rect.x ||
client_move_y != window->rect.y)
need_move_client = TRUE;
/* This is the final target position, but not necessarily what
* we pass to XConfigureWindow, due to StaticGravity implicit
* movement.
*/
window->rect.x = new_x;
window->rect.y = new_y;
} }
else else
{ {
if (root_x_nw != window->rect.x || client_move_x = root_x_nw;
root_y_nw != window->rect.y) client_move_y = root_y_nw;
need_move_client = TRUE; }
window->rect.x = root_x_nw; if (client_move_x != window->rect.x ||
window->rect.y = root_y_nw; client_move_y != window->rect.y)
{
client_move_x = window->rect.x; need_move_client = TRUE;
client_move_y = window->rect.y; window->rect.x = client_move_x;
window->rect.y = client_move_y;
} }
/* If frame extents have changed, fill in other frame fields and /* If frame extents have changed, fill in other frame fields and