From: Rob Bradford <rob@linux.intel.com>
Date: Fri, 20 Apr 2012 16:57:33 +0000 (+0100)
Subject: wayland: Only update position if the with_move flag is set
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=568b310eb355fb1edeaa16f924b32e6077db6995;p=~andy%2Fgtk

wayland: Only update position if the with_move flag is set

This was causing the combobox popup to be moved to (0,0) when just the
size was asserted.
---

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 3448bbc61..48859cd30 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -808,14 +808,17 @@ gdk_window_wayland_restack_toplevel (GdkWindow *window,
 
 static void
 gdk_window_wayland_move_resize (GdkWindow *window,
-				gboolean   with_move,
-				gint       x,
-				gint       y,
-				gint       width,
-				gint       height)
+                                gboolean   with_move,
+                                gint       x,
+                                gint       y,
+                                gint       width,
+                                gint       height)
 {
-  window->x = x;
-  window->y = y;
+  if (with_move)
+    {
+      window->x = x;
+      window->y = y;
+    }
 
   /* If this function is called with width and height = -1 then that means
    * just move the window - don't update its size