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

wayland/surface-role: Rename commit() vfunc apply_state()

Browse Source 
The vfunc is not called when a surface commits its state, but when the
state is applied. Make this clearer by changing the name to
"apply_state" (and "pre_apply_state").

https://gitlab.gnome.org/GNOME/mutter/merge_requests/907
This commit is contained in:
Jonas Ådahl
2019-07-11 11:20:44 +02:00
parent 554644f9e0
commit d02c124e1d
9 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/meta-wayland-shell-surface.c
View File

@ -139,8 +139,8 @@ meta_wayland_shell_surface_managed (MetaWaylandShellSurface *shell_surface,
}
static void
meta_wayland_shell_surface_surface_commit (MetaWaylandSurfaceRole *surface_role,
MetaWaylandSurfaceState *pending)
meta_wayland_shell_surface_surface_apply_state (MetaWaylandSurfaceRole *surface_role,
MetaWaylandSurfaceState *pending)
{
MetaWaylandActorSurface *actor_surface =
META_WAYLAND_ACTOR_SURFACE (surface_role);
@ -153,7 +153,7 @@ meta_wayland_shell_surface_surface_commit (MetaWaylandSurfaceRole *surface_role
surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_shell_surface_parent_class);
surface_role_class->commit (surface_role, pending);
surface_role_class->apply_state (surface_role, pending);
buffer = surface->buffer_ref.buffer;
if (!buffer)
@ -250,7 +250,8 @@ meta_wayland_shell_surface_class_init (MetaWaylandShellSurfaceClass *klass)
object_class->finalize = meta_wayland_shell_surface_finalize;
surface_role_class->commit = meta_wayland_shell_surface_surface_commit;
surface_role_class->apply_state =
meta_wayland_shell_surface_surface_apply_state;
actor_surface_class->get_geometry_scale =
meta_wayland_shell_surface_get_geometry_scale;