isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-12 04:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Handle parent-less popup commits

Browse Source 
A xdg_popup, when active, always has a parent surface. However, a popup
created may immediately become invalid, for example when it is not
granted a grab, in which case it won't be assigned a parent since it
will never be mapped.

This case needs to be handled elsewhere, as one cannot assume a
MetaWaylandXdgPoup that is processed (via wl_surface commit handling
etc) will have a parent_surface.

https://bugzilla.gnome.org/show_bug.cgi?id=771495
This commit is contained in:
Jonas Ådahl 2016-09-16 15:07:22 +08:00
parent 32b87e7bea
commit 417757eab8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wayland/meta-wayland-xdg-shell.c
View File

@ -856,7 +856,10 @@ xdg_popup_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
{ {
MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (surface_role); MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (surface_role);
return meta_wayland_surface_get_toplevel (xdg_popup->parent_surface); if (xdg_popup->parent_surface)
return meta_wayland_surface_get_toplevel (xdg_popup->parent_surface);
else
return NULL;
} }
static void static void