[mutter] Revert "window-wayland: Make sure to save where the position for server-initiated resizes"
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Revert "window-wayland: Make sure to save where the position for server-initiated resizes"
- Date: Mon, 28 Apr 2014 20:23:48 +0000 (UTC)
commit e94f169d4e37eb618f52ca97fd7af3ccd3c96a99
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Apr 28 16:20:53 2014 -0400
Revert "window-wayland: Make sure to save where the position for server-initiated resizes"
This is wrong for client-initiated resizes now.
This reverts commit e6b0525c709def2e9de792bb09c6c42391777468.
src/wayland/window-wayland.c | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/src/wayland/window-wayland.c b/src/wayland/window-wayland.c
index 1cbf0e9..8e13cc2 100644
--- a/src/wayland/window-wayland.c
+++ b/src/wayland/window-wayland.c
@@ -34,9 +34,6 @@
struct _MetaWindowWayland
{
MetaWindow parent;
-
- int saved_x;
- int saved_y;
};
struct _MetaWindowWaylandClass
@@ -122,10 +119,8 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
MetaMoveResizeFlags flags,
MetaMoveResizeResultFlags *result)
{
- MetaWindowWayland *wl_window = META_WINDOW_WAYLAND (window);
gboolean should_move = FALSE;
gboolean is_wayland_resize = FALSE;
- int new_x, new_y;
g_assert (window->frame == NULL);
@@ -143,8 +138,6 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
if (is_wayland_resize)
{
- int dx, dy;
-
/* This is a call to wl_surface_commit(), ignore the constrained_rect and
* update the real client size to match the buffer size.
*/
@@ -156,21 +149,11 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
/* This is a commit of an attach. We should move the window to match the
* new position the client wants. */
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 ||
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,
constrained_rect.width,
constrained_rect.height);
@@ -180,13 +163,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
* and then ack to simply move the window. */
should_move = TRUE;
-
- new_x = constrained_rect.x;
- new_y = constrained_rect.y;
}
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)
{
*result |= META_MOVE_RESIZE_RESULT_MOVED;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]