mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
Use the sibling to reinsert the actor at the right position
Fix a bug where we used the actor to reposition itself in the group. This was probably masked by the sort_depth_order() call.
This commit is contained in:
parent
adfa359e48
commit
ad184c0fe3
@ -324,9 +324,6 @@ clutter_group_real_raise (ClutterContainer *container,
|
|||||||
{
|
{
|
||||||
ClutterGroup *self = CLUTTER_GROUP (container);
|
ClutterGroup *self = CLUTTER_GROUP (container);
|
||||||
ClutterGroupPrivate *priv = self->priv;
|
ClutterGroupPrivate *priv = self->priv;
|
||||||
gint pos;
|
|
||||||
|
|
||||||
pos = g_list_index (priv->children, actor) + 1;
|
|
||||||
|
|
||||||
priv->children = g_list_remove (priv->children, actor);
|
priv->children = g_list_remove (priv->children, actor);
|
||||||
|
|
||||||
@ -344,6 +341,10 @@ clutter_group_real_raise (ClutterContainer *container,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
gint pos;
|
||||||
|
|
||||||
|
pos = g_list_index (priv->children, sibling) + 1;
|
||||||
|
|
||||||
priv->children = g_list_insert (priv->children, actor, pos);
|
priv->children = g_list_insert (priv->children, actor, pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -369,8 +370,6 @@ clutter_group_real_lower (ClutterContainer *container,
|
|||||||
ClutterGroupPrivate *priv = self->priv;
|
ClutterGroupPrivate *priv = self->priv;
|
||||||
gint pos;
|
gint pos;
|
||||||
|
|
||||||
pos = g_list_index (priv->children, actor) - 1;
|
|
||||||
|
|
||||||
priv->children = g_list_remove (priv->children, actor);
|
priv->children = g_list_remove (priv->children, actor);
|
||||||
|
|
||||||
/* Push to bottom */
|
/* Push to bottom */
|
||||||
@ -386,7 +385,13 @@ clutter_group_real_lower (ClutterContainer *container,
|
|||||||
priv->children = g_list_prepend (priv->children, actor);
|
priv->children = g_list_prepend (priv->children, actor);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
priv->children = g_list_insert (priv->children, actor, pos);
|
{
|
||||||
|
gint pos;
|
||||||
|
|
||||||
|
pos = g_list_index (priv->children, sibling) + 1;
|
||||||
|
|
||||||
|
priv->children = g_list_insert (priv->children, actor, pos);
|
||||||
|
}
|
||||||
|
|
||||||
/* See comment in group_raise for this */
|
/* See comment in group_raise for this */
|
||||||
if (sibling &&
|
if (sibling &&
|
||||||
|
Loading…
Reference in New Issue
Block a user