diff options
| author | Robert Mader <robert.mader@collabora.com> | 2022-11-24 17:15:03 +0100 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2023-03-19 21:45:14 +0000 |
| commit | 240f003b242106f77c9e563647d96c7ea09ade5e (patch) | |
| tree | 4d5989cbbb65b095b5a5e52940579073d8cd1905 | |
| parent | 774521cb9e3e0c11a760930f3509ce26c5136c52 (diff) | |
| download | mutter-240f003b242106f77c9e563647d96c7ea09ade5e.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>
(cherry picked from commit 225f7d46a33f7bb88c44fbefc70e7e44eb82aabf)
| -rw-r--r-- | src/wayland/meta-wayland-subsurface.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wayland/meta-wayland-subsurface.c b/src/wayland/meta-wayland-subsurface.c index 83a06c269..53c35c5dc 100644 --- a/src/wayland/meta-wayland-subsurface.c +++ b/src/wayland/meta-wayland-subsurface.c @@ -272,10 +272,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); |