summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2019-06-28 09:18:22 +0000
committerMarco Trevisan <mail@3v1n0.net>2019-06-28 17:46:05 +0000
commit001076339adf7a23f8c92281b3c98eacfaf4a3b4 (patch)
treefdd6d9f2997fe23031ca95d0b3b68a86636aaf93
parent0d570f2dd39d9c388415fd2d83dc465efdd068ba (diff)
downloadmutter-001076339adf7a23f8c92281b3c98eacfaf4a3b4.tar.gz
window-actor: Set actor as compositor private in window before the surface
In MetaWindowActor creation we're setting the compositor private (i.e. the window actor itself) of a window before creating the surface actor, and so passing to the it a window without its compositor side set. Since the surface actor might use the parent actor, set this before updating the surface. https://gitlab.gnome.org/GNOME/mutter/merge_requests/660 (cherry picked from commit 7776941b8950d6be71927b3fb575d66b43964310)
-rw-r--r--src/compositor/meta-window-actor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index c263e3140..993213dae 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -430,6 +430,9 @@ meta_window_actor_constructed (GObject *object)
priv->compositor = window->display->compositor;
+ /* Hang our compositor window state off the MetaWindow for fast retrieval */
+ meta_window_set_compositor_private (window, object);
+
meta_window_actor_update_surface (self);
meta_window_actor_update_opacity (self);
@@ -446,9 +449,6 @@ meta_window_actor_constructed (GObject *object)
priv->first_frame_state = DRAWING_FIRST_FRAME;
meta_window_actor_sync_actor_geometry (self, priv->window->placed);
-
- /* Hang our compositor window state off the MetaWindow for fast retrieval */
- meta_window_set_compositor_private (window, object);
}
static void