[mutter/gnome-42] clutter/actor: Check for clones in update_default_paint_volume()
- From: Robert Mader <rmader src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gnome-42] clutter/actor: Check for clones in update_default_paint_volume()
- Date: Fri, 29 Jul 2022 20:33:15 +0000 (UTC)
commit 3c390eed9243ad93f41efdbc499abe24cc3898ab
Author: Robert Mader <robert mader collabora com>
Date: Tue Jul 26 22:38:14 2022 +0200
clutter/actor: Check for clones in update_default_paint_volume()
This does not fix any known bug but should help ensuring correctness
when clones are used.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2530>
(cherry picked from commit e7a64db51aa2f5bc3e3f36c56e24ed86b51bea68)
clutter/clutter/clutter-actor.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index e67e776491..f6c67ad237 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -5753,7 +5753,9 @@ clutter_actor_update_default_paint_volume (ClutterActor *self,
* allocation, because apparently some code above Clutter allows
* them.
*/
- if (!CLUTTER_ACTOR_IS_MAPPED (child) || !clutter_actor_has_allocation (child))
+ if ((!CLUTTER_ACTOR_IS_MAPPED (child) &&
+ !clutter_actor_has_mapped_clones (child)) ||
+ !clutter_actor_has_allocation (child))
continue;
child_volume = clutter_actor_get_transformed_paint_volume (child, self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]