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

clutter: Remove CLUTTER_ACTOR_IN_REPARENT flag

Browse Source 
The CLUTTER_ACTOR_IN_REPARENT and the CLUTTER_IN_REPARENT flag are never
set and the logic for skipping unmap, unrealize and the emission of the
"parent-set" signal during reparents has been solved differently by
leaving out the CHECK_STATE and EMIT_PARENT_SET flags when calling
add_child_internal() and remove_child_internal().

The only place where those REPARENT flags are theoretically still useful
is in the clutter_actor_verify_map_state() debugging function, but that
is never called during reparent anyway, so simply leave the comment
regarding reparent there.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1228
This commit is contained in:
Jonas Dreßler 2020-05-03 13:55:33 +02:00 committed by Carlos Garnacho
parent 5201d77b0b
commit c38fa4fa5c
2 changed files with 61 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
clutter/clutter/clutter-actor.c
View File

@ -1198,28 +1198,21 @@ clutter_actor_verify_map_state (ClutterActor *self)
if (CLUTTER_ACTOR_IS_REALIZED (self)) if (CLUTTER_ACTOR_IS_REALIZED (self))
{ {
/* all bets are off during reparent when we're potentially realized, if (priv->parent == NULL)
* but should not be according to invariants
*/
if (!CLUTTER_ACTOR_IN_REPARENT (self))
{ {
if (priv->parent == NULL) if (!CLUTTER_ACTOR_IS_TOPLEVEL (self))
{ {
if (CLUTTER_ACTOR_IS_TOPLEVEL (self)) g_warning ("Realized non-toplevel actor '%s' should "
{ "have a parent",
} _clutter_actor_get_debug_name (self));
else
g_warning ("Realized non-toplevel actor '%s' should "
"have a parent",
_clutter_actor_get_debug_name (self));
}
else if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent))
{
g_warning ("Realized actor %s has an unrealized parent %s",
_clutter_actor_get_debug_name (self),
_clutter_actor_get_debug_name (priv->parent));
} }
} }
else if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent))
{
g_warning ("Realized actor %s has an unrealized parent %s",
_clutter_actor_get_debug_name (self),
_clutter_actor_get_debug_name (priv->parent));
}
} }
if (CLUTTER_ACTOR_IS_MAPPED (self)) if (CLUTTER_ACTOR_IS_MAPPED (self))
@ -1228,70 +1221,64 @@ clutter_actor_verify_map_state (ClutterActor *self)
g_warning ("Actor '%s' is mapped but not realized", g_warning ("Actor '%s' is mapped but not realized",
_clutter_actor_get_debug_name (self)); _clutter_actor_get_debug_name (self));
/* remaining bets are off during reparent when we're potentially if (priv->parent == NULL)
* mapped, but should not be according to invariants
*/
if (!CLUTTER_ACTOR_IN_REPARENT (self))
{ {
if (priv->parent == NULL) if (CLUTTER_ACTOR_IS_TOPLEVEL (self))
{ {
if (CLUTTER_ACTOR_IS_TOPLEVEL (self)) if (!CLUTTER_ACTOR_IS_VISIBLE (self) &&
!CLUTTER_ACTOR_IN_DESTRUCTION (self))
{ {
if (!CLUTTER_ACTOR_IS_VISIBLE (self) && g_warning ("Toplevel actor '%s' is mapped "
!CLUTTER_ACTOR_IN_DESTRUCTION (self)) "but not visible",
{
g_warning ("Toplevel actor '%s' is mapped "
"but not visible",
_clutter_actor_get_debug_name (self));
}
}
else
{
g_warning ("Mapped actor '%s' should have a parent",
_clutter_actor_get_debug_name (self)); _clutter_actor_get_debug_name (self));
} }
} }
else else
{ {
ClutterActor *iter = self; g_warning ("Mapped actor '%s' should have a parent",
_clutter_actor_get_debug_name (self));
}
}
else
{
ClutterActor *iter = self;
/* check for the enable_paint_unmapped flag on the actor /* check for the enable_paint_unmapped flag on the actor
* and parents; if the flag is enabled at any point of this * and parents; if the flag is enabled at any point of this
* branch of the scene graph then all the later checks * branch of the scene graph then all the later checks
* become pointless * become pointless
*/ */
while (iter != NULL) while (iter != NULL)
{ {
if (iter->priv->enable_paint_unmapped) if (iter->priv->enable_paint_unmapped)
return; return;
iter = iter->priv->parent; iter = iter->priv->parent;
} }
if (!CLUTTER_ACTOR_IS_VISIBLE (priv->parent)) if (!CLUTTER_ACTOR_IS_VISIBLE (priv->parent))
{ {
g_warning ("Actor '%s' should not be mapped if parent '%s'" g_warning ("Actor '%s' should not be mapped if parent '%s'"
"is not visible", "is not visible",
_clutter_actor_get_debug_name (self), _clutter_actor_get_debug_name (self),
_clutter_actor_get_debug_name (priv->parent)); _clutter_actor_get_debug_name (priv->parent));
} }
if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent)) if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent))
{ {
g_warning ("Actor '%s' should not be mapped if parent '%s'" g_warning ("Actor '%s' should not be mapped if parent '%s'"
"is not realized", "is not realized",
_clutter_actor_get_debug_name (self), _clutter_actor_get_debug_name (self),
_clutter_actor_get_debug_name (priv->parent)); _clutter_actor_get_debug_name (priv->parent));
} }
if (!CLUTTER_ACTOR_IS_TOPLEVEL (priv->parent)) if (!CLUTTER_ACTOR_IS_TOPLEVEL (priv->parent))
{ {
if (!CLUTTER_ACTOR_IS_MAPPED (priv->parent)) if (!CLUTTER_ACTOR_IS_MAPPED (priv->parent))
g_warning ("Actor '%s' is mapped but its non-toplevel " g_warning ("Actor '%s' is mapped but its non-toplevel "
"parent '%s' is not mapped", "parent '%s' is not mapped",
_clutter_actor_get_debug_name (self), _clutter_actor_get_debug_name (self),
_clutter_actor_get_debug_name (priv->parent)); _clutter_actor_get_debug_name (priv->parent));
}
} }
} }
} }
@ -1586,13 +1573,10 @@ clutter_actor_update_map_state (ClutterActor *self,
_clutter_actor_get_debug_name (priv->parent)); _clutter_actor_get_debug_name (priv->parent));
} }
/* If in reparent, we temporarily suspend unmap and unrealize. /* We want to go in the order "realize, map" and "unmap, unrealize" */
*
* We want to go in the order "realize, map" and "unmap, unrealize"
*/
/* Unmap */ /* Unmap */
if (!should_be_mapped && !CLUTTER_ACTOR_IN_REPARENT (self)) if (!should_be_mapped)
clutter_actor_set_mapped (self, FALSE); clutter_actor_set_mapped (self, FALSE);
/* Realize */ /* Realize */
@ -1603,7 +1587,7 @@ clutter_actor_update_map_state (ClutterActor *self,
g_assert (!(must_be_realized && !may_be_realized)); g_assert (!(must_be_realized && !may_be_realized));
/* Unrealize */ /* Unrealize */
if (!may_be_realized && !CLUTTER_ACTOR_IN_REPARENT (self)) if (!may_be_realized)
clutter_actor_unrealize_not_hiding (self); clutter_actor_unrealize_not_hiding (self);
/* Map */ /* Map */
@ -4578,8 +4562,7 @@ clutter_actor_remove_child_internal (ClutterActor *self,
clutter_actor_queue_compute_expand (self); clutter_actor_queue_compute_expand (self);
} }
if (emit_parent_set && !CLUTTER_ACTOR_IN_REPARENT (child) && if (emit_parent_set && !CLUTTER_ACTOR_IN_DESTRUCTION (child))
!CLUTTER_ACTOR_IN_DESTRUCTION (child))
{ {
child->priv->needs_compute_resource_scale = TRUE; child->priv->needs_compute_resource_scale = TRUE;
g_signal_emit (child, actor_signals[PARENT_SET], 0, self); g_signal_emit (child, actor_signals[PARENT_SET], 0, self);
@ -13193,7 +13176,7 @@ clutter_actor_add_child_internal (ClutterActor *self,
clutter_actor_queue_compute_expand (self); clutter_actor_queue_compute_expand (self);
} }
if (emit_parent_set && !CLUTTER_ACTOR_IN_REPARENT (child)) if (emit_parent_set)
{ {
child->priv->needs_compute_resource_scale = TRUE; child->priv->needs_compute_resource_scale = TRUE;
g_signal_emit (child, actor_signals[PARENT_SET], 0, NULL); g_signal_emit (child, actor_signals[PARENT_SET], 0, NULL);

2
clutter/clutter/clutter-private.h
View File

@ -65,7 +65,6 @@ typedef struct _ClutterVertex4 ClutterVertex4;
#define CLUTTER_ACTOR_IS_TOPLEVEL(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IS_TOPLEVEL) != FALSE) #define CLUTTER_ACTOR_IS_TOPLEVEL(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IS_TOPLEVEL) != FALSE)
#define CLUTTER_ACTOR_IN_DESTRUCTION(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_DESTRUCTION) != FALSE) #define CLUTTER_ACTOR_IN_DESTRUCTION(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_DESTRUCTION) != FALSE)
#define CLUTTER_ACTOR_IN_REPARENT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_REPARENT) != FALSE)
#define CLUTTER_ACTOR_IN_PAINT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE) #define CLUTTER_ACTOR_IN_PAINT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE)
#define CLUTTER_ACTOR_IN_PICK(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PICK) != FALSE) #define CLUTTER_ACTOR_IN_PICK(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PICK) != FALSE)
#define CLUTTER_ACTOR_IN_RELAYOUT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE) #define CLUTTER_ACTOR_IN_RELAYOUT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE)
@ -99,7 +98,6 @@ typedef enum
CLUTTER_IN_DESTRUCTION = 1 << 0, CLUTTER_IN_DESTRUCTION = 1 << 0,
CLUTTER_IS_TOPLEVEL = 1 << 1, CLUTTER_IS_TOPLEVEL = 1 << 1,
CLUTTER_IN_REPARENT = 1 << 2,
CLUTTER_IN_PREF_WIDTH = 1 << 3, CLUTTER_IN_PREF_WIDTH = 1 << 3,
CLUTTER_IN_PREF_HEIGHT = 1 << 4, CLUTTER_IN_PREF_HEIGHT = 1 << 4,