]> Pileus Git - ~andy/gtk/commitdiff
wayland: Only update position if the with_move flag is set
authorRob Bradford <rob@linux.intel.com>
Fri, 20 Apr 2012 16:57:33 +0000 (17:57 +0100)
committerRob Bradford <rob@linux.intel.com>
Wed, 25 Apr 2012 11:00:40 +0000 (12:00 +0100)
This was causing the combobox popup to be moved to (0,0) when just the
size was asserted.

gdk/wayland/gdkwindow-wayland.c

index 3448bbc61e97f457cc36b0972b2ada8c2d5a4581..48859cd30ff368ccf9a068a616344ba3885bf7d2 100644 (file)
@@ -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