brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland-surface: Fix transient_for

Browse Source 
It takes a wl_surface resource, not an xdg_shell_surface resource,
and the argument is allowed to be NULL.
This commit is contained in:
Jasper St. Pierre 2013-11-21 13:09:13 -05:00
parent ebf6862a10
commit a37a8c6497
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wayland/meta-wayland-surface.c
View File

@ -524,14 +524,19 @@ xdg_surface_destroy (struct wl_client *client,
static void static void
xdg_surface_set_transient_for (struct wl_client *client, xdg_surface_set_transient_for (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
struct wl_resource *parent) struct wl_resource *parent_resource)
{ {
MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource); MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface); MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface);
MetaWaylandSurfaceExtension *parent_xdg_surface = wl_resource_get_user_data (parent); MetaWindow *transient_for = NULL;
MetaWaylandSurface *parent_surface = wl_container_of (parent_xdg_surface, surface, xdg_surface);
meta_window_set_transient_for (surface->window, parent_surface->window); if (parent_resource)
{
MetaWaylandSurface *parent_surface = wl_resource_get_user_data (parent_resource);
transient_for = parent_surface->window;
}
meta_window_set_transient_for (surface->window, transient_for);
} }
static void static void