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-wayland: Make sure to save where the position for server-initiated resizes

Browse Source 
For the server-initiated resize case, like unmaximize or some forms
of tiling, we dropped the x/y of the server-assigned rectangle on the
floor, which meant the surface didn't move to where it needed to be in
that case. Now, save it internally, and combine it with the dx/dy passed
in during attaches to figure out where we actually need to be.

This fixes incorrect surface placement after unmaximization.
This commit is contained in:
Jasper St. Pierre 2014-04-28 16:07:49 -04:00
parent 23ae11043f
commit e6b0525c70
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wayland/window-wayland.c
View File

@ -34,6 +34,9 @@
struct _MetaWindowWayland struct _MetaWindowWayland
{ {
MetaWindow parent; MetaWindow parent;
int saved_x;
int saved_y;
}; };
struct _MetaWindowWaylandClass struct _MetaWindowWaylandClass
@ -119,8 +122,10 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
MetaMoveResizeFlags flags, MetaMoveResizeFlags flags,
MetaMoveResizeResultFlags *result) MetaMoveResizeResultFlags *result)
{ {
MetaWindowWayland *wl_window = META_WINDOW_WAYLAND (window);
gboolean should_move = FALSE; gboolean should_move = FALSE;
gboolean is_wayland_resize = FALSE; gboolean is_wayland_resize = FALSE;
int new_x, new_y;
g_assert (window->frame == NULL); g_assert (window->frame == NULL);
@ -138,6 +143,8 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
if (is_wayland_resize) if (is_wayland_resize)
{ {
int dx, dy;
/* This is a call to wl_surface_commit(), ignore the constrained_rect and /* This is a call to wl_surface_commit(), ignore the constrained_rect and
* update the real client size to match the buffer size. * update the real client size to match the buffer size.
*/ */
@ -149,11 +156,21 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
/* This is a commit of an attach. We should move the window to match the /* This is a commit of an attach. We should move the window to match the
* new position the client wants. */ * new position the client wants. */
should_move = TRUE; should_move = TRUE;
/* The dx/dy that the client asked for. */
dx = requested_rect.x - window->rect.x;
dy = requested_rect.y - window->rect.y;
new_x = wl_window->saved_x + dx;
new_y = wl_window->saved_y + dy;
} }
if (constrained_rect.width != window->rect.width || if (constrained_rect.width != window->rect.width ||
constrained_rect.height != window->rect.height) constrained_rect.height != window->rect.height)
{ {
wl_window->saved_x = constrained_rect.x;
wl_window->saved_y = constrained_rect.y;
meta_wayland_surface_configure_notify (window->surface, meta_wayland_surface_configure_notify (window->surface,
constrained_rect.width, constrained_rect.width,
constrained_rect.height); constrained_rect.height);
@ -163,13 +180,13 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
/* We're just moving the window, so we don't need to wait for a configure /* We're just moving the window, so we don't need to wait for a configure
* and then ack to simply move the window. */ * and then ack to simply move the window. */
should_move = TRUE; should_move = TRUE;
new_x = constrained_rect.x;
new_y = constrained_rect.y;
} }
if (should_move) if (should_move)
{ {
int new_x = constrained_rect.x;
int new_y = constrained_rect.y;
if (new_x != window->rect.x || new_y != window->rect.y) if (new_x != window->rect.x || new_y != window->rect.y)
{ {
*result |= META_MOVE_RESIZE_RESULT_MOVED; *result |= META_MOVE_RESIZE_RESULT_MOVED;