From 632e4097b5bf1fdd6caef80a8d8d5fd461497b28 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 29 Nov 2016 11:44:29 -0500 Subject: [PATCH] always send valid size geom when configuring xdg6 popups sending 0x0 here when passed (which happens during initial commit) breaks the universe --- src/modules/wl_desktop_shell/xdg6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c index 3debdf175..22b10efdf 100644 --- a/src/modules/wl_desktop_shell/xdg6.c +++ b/src/modules/wl_desktop_shell/xdg6.c @@ -386,7 +386,7 @@ _e_xdg_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges shd = ec->comp_data->shell.data; serial = wl_display_next_serial(e_comp_wl->wl.disp); - zxdg_popup_v6_send_configure(resource, ec->x - ec->parent->x, ec->y - ec->parent->y, width, height); + zxdg_popup_v6_send_configure(resource, ec->x - ec->parent->x, ec->y - ec->parent->y, width ?: ec->w, height ?: ec->h); zxdg_surface_v6_send_configure(shd->surface, serial); return; }