diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-02-13 14:01:55 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-02-27 14:58:35 +0200 |
| commit | 66bc949b72efeebd36f8c7ac2264dbbcff9d4a29 (patch) | |
| tree | def56172ea2e838bedd348ebdc27c446ed1b5209 /desktop-shell | |
| parent | 502f5e06a2011ff07fb972719a668af24b0fc7e8 (diff) | |
| download | weston-66bc949b72efeebd36f8c7ac2264dbbcff9d4a29.tar.gz weston-66bc949b72efeebd36f8c7ac2264dbbcff9d4a29.tar.bz2 weston-66bc949b72efeebd36f8c7ac2264dbbcff9d4a29.zip | |
xdg-shell: Take a xdg_surface as the parent surface
There is no other valid surface that we should be using here.
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 1242f93c..076b4549 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3717,14 +3717,14 @@ xdg_surface_set_parent(struct wl_client *client, struct wl_resource *parent_resource) { struct shell_surface *shsurf = wl_resource_get_user_data(resource); - struct weston_surface *parent; + struct shell_surface *parent; - if (parent_resource) + if (parent_resource) { parent = wl_resource_get_user_data(parent_resource); - else - parent = NULL; - - shell_surface_set_parent(shsurf, parent); + shell_surface_set_parent(shsurf, parent->surface); + } else { + shell_surface_set_parent(shsurf, NULL); + } } static void |