brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually, if the parent of MutterWindow is a container, use the interface.

Browse Source 
Just unparenting the window does not automatically remove it from it's
  parent.
This commit is contained in:
Tomas Frydrych 2009-02-09 17:01:37 +00:00
parent 16d49695ad
commit 770a6f0138
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,7 +972,14 @@ mutter_window_effect_completed (MutterWindow *cw, gulong event)
if (priv->needs_destroy && effect_in_progress (cw, TRUE) == FALSE)
{
clutter_actor_unparent (CLUTTER_ACTOR (cw));
ClutterActor *cwa = CLUTTER_ACTOR (cw);
ClutterActor *parent = clutter_actor_get_parent (cwa);
if (CLUTTER_IS_CONTAINER (parent))
clutter_container_remove_actor (CLUTTER_CONTAINER (parent), cwa);
else
clutter_actor_unparent (cwa);
return;
}
@ -1040,7 +1047,14 @@ destroy_win (MutterWindow *cw)
/*
* No effects, just kill it.
*/
clutter_actor_unparent (CLUTTER_ACTOR (cw));
ClutterActor *cwa = CLUTTER_ACTOR (cw);
ClutterActor *parent = clutter_actor_get_parent (cwa);
if (CLUTTER_IS_CONTAINER (parent))
clutter_container_remove_actor (CLUTTER_CONTAINER (parent), cwa);
else
clutter_actor_unparent (cwa);
return;
}
@ -1062,7 +1076,15 @@ destroy_win (MutterWindow *cw)
priv->needs_destroy = TRUE;
}
else
clutter_actor_unparent (CLUTTER_ACTOR (cw));
{
ClutterActor *cwa = CLUTTER_ACTOR (cw);
ClutterActor *parent = clutter_actor_get_parent (cwa);
if (CLUTTER_IS_CONTAINER (parent))
clutter_container_remove_actor (CLUTTER_CONTAINER (parent), cwa);
else
clutter_actor_unparent (cwa);
}
}
}