mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdg-shell: Take a xdg_surface as the parent surface

Browse Source 
There is no other valid surface that we should be using here.

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jasper St. Pierre
2015-02-13 14:01:55 +08:00
committed by Pekka Paalanen
parent 502f5e06a2
commit 66bc949b72
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+7 -7
View File
@@ -253,7 +253,7 @@ struct window {
struct xdg_popup *xdg_popup;
struct window *parent;
struct wl_surface *last_parent_surface;
struct window *last_parent;
struct ivi_surface *ivi_surface;
@@ -4031,21 +4031,21 @@ static const struct xdg_surface_listener xdg_surface_listener = {
static void
window_sync_parent(struct window *window)
{
struct wl_surface *parent_surface;
struct xdg_surface *parent_surface;
if (!window->xdg_surface)
return;
if (window->parent == window->last_parent)
return;
if (window->parent)
parent_surface = window->parent->main_surface->surface;
parent_surface = window->parent->xdg_surface;
else
parent_surface = NULL;
if (parent_surface == window->last_parent_surface)
return;
xdg_surface_set_parent(window->xdg_surface, parent_surface);
window->last_parent_surface = parent_surface;
window->last_parent = window->parent;
}
static void