From 077606c05729c3506ade2d87b4e733a11604c6ce Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 26 Jun 2014 11:02:57 -0400 Subject: [PATCH] window-wayland: Correct the buffer rect for frame extents --- src/wayland/window-wayland.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/wayland/window-wayland.c b/src/wayland/window-wayland.c index 5f13c4cd7..38cf6c8ae 100644 --- a/src/wayland/window-wayland.c +++ b/src/wayland/window-wayland.c @@ -214,8 +214,11 @@ meta_window_wayland_move_resize_internal (MetaWindow *window, if (new_x != window->rect.x || new_y != window->rect.y) { *result |= META_MOVE_RESIZE_RESULT_MOVED; - window->rect.x = window->buffer_rect.x = new_x; - window->rect.y = window->buffer_rect.y = new_y; + window->rect.x = new_x; + window->rect.y = new_y; + + window->buffer_rect.x = new_x - window->custom_frame_extents.left; + window->buffer_rect.y = new_y - window->custom_frame_extents.top; } } } @@ -361,8 +364,6 @@ meta_window_wayland_move_resize (MetaWindow *window, rect.width = width; rect.height = height; - window->buffer_rect = rect; - if (rect.width != window->rect.width || rect.height != window->rect.height) flags |= META_IS_RESIZE_ACTION;