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

[layout] Replace stale LayoutMeta

Browse Source 
If a LayoutMeta references a different container and/or layout manager
then we should simply replace it and discard the previous one.
This commit is contained in:
Emmanuele Bassi 2009-09-16 15:47:26 +01:00
parent 9117ee2056
commit 22bb243ec2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/clutter-layout-manager.c
View File

@ -344,7 +344,7 @@ get_child_meta (ClutterLayoutManager *manager,
ClutterContainer *container, ClutterContainer *container,
ClutterActor *actor) ClutterActor *actor)
{ {
ClutterLayoutMeta *layout; ClutterLayoutMeta *layout = NULL;
layout = g_object_get_qdata (G_OBJECT (actor), quark_layout_meta); layout = g_object_get_qdata (G_OBJECT (actor), quark_layout_meta);
if (layout != NULL) if (layout != NULL)
@ -355,6 +355,21 @@ get_child_meta (ClutterLayoutManager *manager,
child->container == container && child->container == container &&
child->actor == actor) child->actor == actor)
return layout; return layout;
/* if the LayoutMeta referenced is not attached to the
* layout manager then we simply ask the layout manager
* to replace it with the right one
*/
layout = create_child_meta (manager, container, actor);
if (layout != NULL)
{
g_assert (CLUTTER_IS_LAYOUT_META (layout));
g_object_set_qdata_full (G_OBJECT (actor), quark_layout_meta,
layout,
(GDestroyNotify) g_object_unref);
}
return layout;
} }
return NULL; return NULL;