isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/actor-surface: Check for MetaXwaylandSurface instead of window type

Browse Source 
The previous check would not ignore subsurfaces. Use the chance to directly
check for the surface role instead - it's much cleaner.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1082
This commit is contained in:
Robert Mader 2020-02-23 16:09:21 +01:00 committed by Carlos Garnacho
parent 46e38ff61a
commit 0ada90024f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-wayland-actor-surface.c
View File

@ -31,6 +31,7 @@
#include "wayland/meta-wayland-buffer.h" #include "wayland/meta-wayland-buffer.h"
#include "wayland/meta-wayland-surface.h" #include "wayland/meta-wayland-surface.h"
#include "wayland/meta-window-wayland.h" #include "wayland/meta-window-wayland.h"
#include "wayland/meta-xwayland-surface.h"
typedef struct _MetaWaylandActorSurfacePrivate MetaWaylandActorSurfacePrivate; typedef struct _MetaWaylandActorSurfacePrivate MetaWaylandActorSurfacePrivate;
@ -150,7 +151,6 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
MetaShapedTexture *stex; MetaShapedTexture *stex;
MetaWaylandBuffer *buffer; MetaWaylandBuffer *buffer;
cairo_rectangle_int_t surface_rect; cairo_rectangle_int_t surface_rect;
MetaWindow *window;
MetaWaylandSurface *subsurface_surface; MetaWaylandSurface *subsurface_surface;
surface_actor = priv->actor; surface_actor = priv->actor;
@ -195,9 +195,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
meta_surface_actor_set_input_region (surface_actor, NULL); meta_surface_actor_set_input_region (surface_actor, NULL);
} }
window = meta_wayland_surface_get_window (surface); if (!META_IS_XWAYLAND_SURFACE (surface_role))
if (window &&
window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
{ {
if (surface->opaque_region) if (surface->opaque_region)
{ {