mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05:00
clutter: Refactor code marking actors dirty for paint()
Simplify the function arguments (the origin is just the actor that the function is originally called from), and make it also handle marking as dirty the actor that got the redraw queued up explicitly. This makes it a single place where priv->is_dirty is being enabled. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2353>
This commit is contained in:
parent
47375897a5
commit
ce7f606d48
@ -2646,9 +2646,10 @@ _clutter_actor_queue_redraw_on_clones (ClutterActor *self)
|
||||
}
|
||||
|
||||
static void
|
||||
_clutter_actor_propagate_queue_redraw (ClutterActor *self,
|
||||
ClutterActor *origin)
|
||||
_clutter_actor_propagate_queue_redraw (ClutterActor *self)
|
||||
{
|
||||
ClutterActor *origin = self;
|
||||
|
||||
while (self)
|
||||
{
|
||||
/* no point in queuing a redraw on a destroyed actor */
|
||||
@ -2657,13 +2658,12 @@ _clutter_actor_propagate_queue_redraw (ClutterActor *self,
|
||||
|
||||
_clutter_actor_queue_redraw_on_clones (self);
|
||||
|
||||
self->priv->is_dirty = TRUE;
|
||||
|
||||
/* If the queue redraw is coming from a child then the actor has
|
||||
become dirty and any queued effect is no longer valid */
|
||||
if (self != origin)
|
||||
{
|
||||
self->priv->is_dirty = TRUE;
|
||||
self->priv->effect_to_redraw = NULL;
|
||||
}
|
||||
self->priv->effect_to_redraw = NULL;
|
||||
|
||||
/* If the actor isn't visible, we still had to emit the signal
|
||||
* to allow for a ClutterClone, but the appearance of the parent
|
||||
@ -8105,10 +8105,8 @@ _clutter_actor_queue_redraw_full (ClutterActor *self,
|
||||
priv->effect_to_redraw = NULL;
|
||||
}
|
||||
|
||||
priv->is_dirty = TRUE;
|
||||
|
||||
if (!priv->propagated_one_redraw)
|
||||
_clutter_actor_propagate_queue_redraw (self, self);
|
||||
_clutter_actor_propagate_queue_redraw (self);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user