isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not destroy the GLX texture during redecoration.

Browse Source 
Just ensure that it is on the top of the internal actor stack.
This commit is contained in:
Tomas Frydrych 2009-02-11 14:20:37 +00:00
parent fb1fc4e7c6
commit f4bc825cf8
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/compositor/mutter/compositor-mutter.c
View File

@ -385,28 +385,10 @@ mutter_meta_window_decorated_notify (MetaWindow *mw,
priv->shadow = NULL; priv->shadow = NULL;
} }
if (priv->actor)
{
ClutterActor *p = clutter_actor_get_parent (priv->actor);
if (CLUTTER_IS_CONTAINER (p))
clutter_container_remove_actor (CLUTTER_CONTAINER (p), priv->actor);
else
clutter_actor_unparent (priv->actor);
priv->actor = NULL;
}
/* /*
* Recreate the contents. * Recreate the contents.
*/ */
mutter_window_constructed (G_OBJECT (mcw)); mutter_window_constructed (G_OBJECT (mcw));
/*
* And adjust position.
*/
clutter_actor_set_position (CLUTTER_ACTOR (mcw),
priv->attrs.x, priv->attrs.y);
} }
static void static void
@ -473,16 +455,28 @@ mutter_window_constructed (GObject *object)
clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->shadow); clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->shadow);
} }
priv->actor = mutter_shaped_texture_new (); if (!priv->actor)
{
priv->actor = mutter_shaped_texture_new ();
if (!clutter_glx_texture_pixmap_using_extension ( if (!clutter_glx_texture_pixmap_using_extension (
CLUTTER_GLX_TEXTURE_PIXMAP (priv->actor))) CLUTTER_GLX_TEXTURE_PIXMAP (priv->actor)))
g_warning ("NOTE: Not using GLX TFP!\n"); g_warning ("NOTE: Not using GLX TFP!\n");
clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->actor); clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->actor);
g_signal_connect (priv->window, "notify::decorated",
G_CALLBACK (mutter_meta_window_decorated_notify), self);
}
else
{
/*
* This is the case where existing window is gaining/loosing frame.
* Just ensure the actor is top most (i.e., above shadow).
*/
clutter_actor_raise_top (priv->actor);
}
g_signal_connect (priv->window, "notify::decorated",
G_CALLBACK (mutter_meta_window_decorated_notify), self);
update_shape (compositor, self); update_shape (compositor, self);
} }