From 647743aa5fc1c31c03dd70f47e70e016ff0925ab Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 28 Apr 2014 16:21:06 -0400 Subject: [PATCH] Revert "window-wayland: Don't enter the only-moving path for Wayland resizes" We're going to use the old code structure now. This reverts commit 23ae11043f298fc8489c5f1436ff613b39c61072. --- src/wayland/window-wayland.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wayland/window-wayland.c b/src/wayland/window-wayland.c index 8e13cc2bd..ea0674bc8 100644 --- a/src/wayland/window-wayland.c +++ b/src/wayland/window-wayland.c @@ -120,7 +120,6 @@ meta_window_wayland_move_resize_internal (MetaWindow *window, MetaMoveResizeResultFlags *result) { gboolean should_move = FALSE; - gboolean is_wayland_resize = FALSE; g_assert (window->frame == NULL); @@ -134,9 +133,7 @@ meta_window_wayland_move_resize_internal (MetaWindow *window, * it can be for maximized or fullscreen. */ - is_wayland_resize = (flags & META_IS_WAYLAND_RESIZE); - - if (is_wayland_resize) + if (flags & META_IS_WAYLAND_RESIZE) { /* This is a call to wl_surface_commit(), ignore the constrained_rect and * update the real client size to match the buffer size. @@ -158,7 +155,7 @@ meta_window_wayland_move_resize_internal (MetaWindow *window, constrained_rect.width, constrained_rect.height); } - else if (!is_wayland_resize) + else { /* We're just moving the window, so we don't need to wait for a configure * and then ack to simply move the window. */