isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/actor-surface: Call ensure_size_valid() on shaped-texture

Browse Source 
Use the new API to make sure the shaped texture has a valid size
during the next layout phase.

This is needed here because, quoting the previous commit:

When the texture size is invalidated using `invalidate_size()`, the new
size will only get calculated the next time `update_size()` is
called. This happens e.g. in `meta_shaped_texture_get_preferred_size()`
via `ensure_size_valid()`.

`update_size()` can chain up to `clutter_content_invalidate_size()`
as well as emitting a `size-changed` signal. If this happens during
layout, the result is a 'change the layout conditions during layout'
issue, causing heavy breakage in e.g. the Shell overview.

To fix this, expose `ensure_size_valid()` as API so callers can make
sure the texture has a valid size without creating redundant size
invalidations calls.

Note that if a buffer with a new size is attached we already trigger
`update_size()` explicitely, avoiding such situations.

Closes https://gitlab.gnome.org/GNOME/mutter/-/issues/1718

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1799>
This commit is contained in:
Robert Mader 2021-03-23 14:01:13 +01:00 committed by Marge Bot
parent 5772c27e04
commit a09c914230
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,6 +271,8 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
meta_surface_actor_reset_viewport_dst_size (surface_actor); meta_surface_actor_reset_viewport_dst_size (surface_actor);
} }
meta_shaped_texture_ensure_size_valid (stex);
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (surface, subsurface_surface) META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (surface, subsurface_surface)
{ {
MetaWaylandActorSurface *actor_surface; MetaWaylandActorSurface *actor_surface;