[mutter] window-wayland: Don't enter the only-moving path for Wayland resizes



commit 23ae11043f298fc8489c5f1436ff613b39c61072
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Apr 28 16:06:30 2014 -0400

    window-wayland: Don't enter the only-moving path for Wayland resizes
    
    We'll be adding additional code here for "correct" moving soon, so
    we need to make sure not to do it for Wayland resizes.

 src/wayland/window-wayland.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/wayland/window-wayland.c b/src/wayland/window-wayland.c
index ea0674b..8e13cc2 100644
--- a/src/wayland/window-wayland.c
+++ b/src/wayland/window-wayland.c
@@ -120,6 +120,7 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
                                           MetaMoveResizeResultFlags *result)
 {
   gboolean should_move = FALSE;
+  gboolean is_wayland_resize = FALSE;
 
   g_assert (window->frame == NULL);
 
@@ -133,7 +134,9 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
    * it can be for maximized or fullscreen.
    */
 
-  if (flags & META_IS_WAYLAND_RESIZE)
+  is_wayland_resize = (flags & META_IS_WAYLAND_RESIZE);
+
+  if (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.
@@ -155,7 +158,7 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
                                              constrained_rect.width,
                                              constrained_rect.height);
     }
-  else
+  else if (!is_wayland_resize)
     {
       /* We're just moving the window, so we don't need to wait for a configure
        * and then ack to simply move the window. */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]