brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window-wayland: Rename saved_pos to pending_move

Browse Source 
This is really what it is -- if we make the move/resize at the same time
as a move, we need to pend the move until the client submits the resize.
This commit is contained in:
Jasper St. Pierre 2014-07-27 17:37:18 +02:00
parent b60e02956d
commit c844611052
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,9 +36,9 @@ struct _MetaWindowWayland
{ {
MetaWindow parent; MetaWindow parent;
gboolean has_saved_pos; gboolean has_pending_move;
int saved_x; int pending_move_x;
int saved_y; int pending_move_y;
int last_sent_width; int last_sent_width;
int last_sent_height; int last_sent_height;
@ -205,9 +205,9 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
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->has_saved_pos = TRUE; wl_window->has_pending_move = TRUE;
wl_window->saved_x = constrained_rect.x; wl_window->pending_move_x = constrained_rect.x;
wl_window->saved_y = constrained_rect.y; wl_window->pending_move_y = constrained_rect.y;
wl_window->last_sent_width = constrained_rect.width; wl_window->last_sent_width = constrained_rect.width;
wl_window->last_sent_height = constrained_rect.height; wl_window->last_sent_height = constrained_rect.height;
@ -368,11 +368,11 @@ meta_window_wayland_move_resize (MetaWindow *window,
/* x/y are ignored when we're doing interactive resizing */ /* x/y are ignored when we're doing interactive resizing */
if (!meta_grab_op_is_resizing (window->display->grab_op)) if (!meta_grab_op_is_resizing (window->display->grab_op))
{ {
if (wl_window->has_saved_pos) if (wl_window->has_pending_move)
{ {
rect.x = wl_window->saved_x; rect.x = wl_window->pending_move_x;
rect.y = wl_window->saved_y; rect.y = wl_window->pending_move_y;
wl_window->has_saved_pos = FALSE; wl_window->has_pending_move = FALSE;
flags |= META_IS_MOVE_ACTION; flags |= META_IS_MOVE_ACTION;
} }
else else