summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mader <robert.mader@collabora.com>2022-11-24 17:15:03 +0100
committerMarge Bot <marge-bot@gnome.org>2022-12-09 20:48:55 +0000
commit225f7d46a33f7bb88c44fbefc70e7e44eb82aabf (patch)
treea5c164e8bb339c996b148a835f2de3e12b505cdb
parent8af356c2c791a236977bbcc347e8d4378b6587ea (diff)
downloadmutter-225f7d46a33f7bb88c44fbefc70e7e44eb82aabf.tar.gz
wayland/subsurface: Check ancestor instead of toplevel window for actor sync
The intention here was to check if the subsurface belongs to a window. Thus it didn't behave as expected for subsurfaces belonging to non-toplevel windows. After the previous commit we can use `get_window()` to check for what we actually want here. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2717>
-rw-r--r--src/wayland/meta-wayland-subsurface.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wayland/meta-wayland-subsurface.c b/src/wayland/meta-wayland-subsurface.c
index 4feefae30..a97971352 100644
--- a/src/wayland/meta-wayland-subsurface.c
+++ b/src/wayland/meta-wayland-subsurface.c
@@ -242,10 +242,8 @@ meta_wayland_subsurface_sync_actor_state (MetaWaylandActorSurface *actor_surface
meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandActorSurfaceClass *actor_surface_class =
META_WAYLAND_ACTOR_SURFACE_CLASS (meta_wayland_subsurface_parent_class);
- MetaWaylandSurface *toplevel_surface;
- toplevel_surface = meta_wayland_surface_get_toplevel (surface);
- if (toplevel_surface && meta_wayland_surface_get_window (toplevel_surface))
+ if (meta_wayland_surface_get_window (surface))
actor_surface_class->sync_actor_state (actor_surface);
sync_actor_subsurface_state (surface);