isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-10-06 06:06:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Refactor code marking actors dirty for paint()

Browse Source 
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:
Carlos Garnacho 2022-03-30 20:59:37 +02:00 committed by Marge Bot
parent 47375897a5
commit ce7f606d48
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2646,9 +2646,10 @@ _clutter_actor_queue_redraw_on_clones (ClutterActor *self)
} }
static void static void
_clutter_actor_propagate_queue_redraw (ClutterActor *self, _clutter_actor_propagate_queue_redraw (ClutterActor *self)
ClutterActor *origin)
{ {
ClutterActor *origin = self;
while (self) while (self)
{ {
/* no point in queuing a redraw on a destroyed actor */ /* 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); _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 /* If the queue redraw is coming from a child then the actor has
become dirty and any queued effect is no longer valid */ become dirty and any queued effect is no longer valid */
if (self != origin) if (self != origin)
{ self->priv->effect_to_redraw = NULL;
self->priv->is_dirty = TRUE;
self->priv->effect_to_redraw = NULL;
}
/* If the actor isn't visible, we still had to emit the signal /* If the actor isn't visible, we still had to emit the signal
* to allow for a ClutterClone, but the appearance of the parent * 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->effect_to_redraw = NULL;
} }
priv->is_dirty = TRUE;
if (!priv->propagated_one_redraw) if (!priv->propagated_one_redraw)
_clutter_actor_propagate_queue_redraw (self, self); _clutter_actor_propagate_queue_redraw (self);
} }
/** /**