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

wayland: Add frame callbacks to the actor based on the role

Browse Source 
Checking for the presense of the actor is wrong because we always
create one.

https://bugzilla.gnome.org/show_bug.cgi?id=739163
This commit is contained in:
Adel Gadllah 2015-08-09 12:54:00 +02:00
parent b0b08d5010
commit 4dc5882777
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,11 +541,21 @@ apply_pending_state (MetaWaylandSurface *surface,
}
/* wl_surface.frame */
if (surface->surface_actor)
meta_surface_actor_wayland_add_frame_callbacks (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor),
&pending->frame_callback_list);
else
wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list);
switch (surface->role)
{
case META_WAYLAND_SURFACE_ROLE_NONE:
case META_WAYLAND_SURFACE_ROLE_CURSOR:
case META_WAYLAND_SURFACE_ROLE_DND:
wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list);
break;
case META_WAYLAND_SURFACE_ROLE_XDG_SURFACE:
case META_WAYLAND_SURFACE_ROLE_XDG_POPUP:
case META_WAYLAND_SURFACE_ROLE_WL_SHELL_SURFACE:
case META_WAYLAND_SURFACE_ROLE_SUBSURFACE:
meta_surface_actor_wayland_add_frame_callbacks (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor),
&pending->frame_callback_list);
break;
}
wl_list_init (&pending->frame_callback_list);
switch (surface->role)