From dba9c2e5a763fc67457accb4da2681a43658df35 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Tue, 17 Jan 2012 14:59:03 +0000 Subject: [PATCH] wayland: Adapt move_resize vfunc implementation to match semantics Callers of this function were passing in -1, -1 for the width and height if they just wanted the window moving - rather than the size changing. We need to respect that behaviour and don't try and set the width/height to those dimensions. Now pop-up windows (ala combo-boxes) work! --- gdk/wayland/gdkwindow-wayland.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 834642e1ab..897c61c412 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -637,7 +637,11 @@ gdk_window_wayland_move_resize (GdkWindow *window, window->x = x; window->y = y; - _gdk_wayland_window_update_size (window, width, height, 0); + /* If this function is called with width and height = -1 then that means + * just move the window - don't update its size + */ + if (width > 0 && height > 0) + _gdk_wayland_window_update_size (window, width, height, 0); } static void