From c844611052e4dc3108350c8a907287b13e0d1c63 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 27 Jul 2014 17:37:18 +0200 Subject: [PATCH] window-wayland: Rename saved_pos to pending_move 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. --- src/wayland/window-wayland.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/wayland/window-wayland.c b/src/wayland/window-wayland.c index 6aa2d321d..9d10a6783 100644 --- a/src/wayland/window-wayland.c +++ b/src/wayland/window-wayland.c @@ -36,9 +36,9 @@ struct _MetaWindowWayland { MetaWindow parent; - gboolean has_saved_pos; - int saved_x; - int saved_y; + gboolean has_pending_move; + int pending_move_x; + int pending_move_y; int last_sent_width; int last_sent_height; @@ -205,9 +205,9 @@ meta_window_wayland_move_resize_internal (MetaWindow *window, if (constrained_rect.width != window->rect.width || constrained_rect.height != window->rect.height) { - wl_window->has_saved_pos = TRUE; - wl_window->saved_x = constrained_rect.x; - wl_window->saved_y = constrained_rect.y; + wl_window->has_pending_move = TRUE; + wl_window->pending_move_x = constrained_rect.x; + wl_window->pending_move_y = constrained_rect.y; wl_window->last_sent_width = constrained_rect.width; 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 */ 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.y = wl_window->saved_y; - wl_window->has_saved_pos = FALSE; + rect.x = wl_window->pending_move_x; + rect.y = wl_window->pending_move_y; + wl_window->has_pending_move = FALSE; flags |= META_IS_MOVE_ACTION; } else