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

clutter/actor: Rename paint_volume_valid to has_paint_volume for clarity

Browse Source 
Rename the paint_volume_valid flag to has_paint_volume in order to
better reflect what it's for.

The name "paint_volume_valid" implies that the paint volume can be
invalidated and thus sounds like it's involved with some kind of
caching. The flag that's actually involved with caching is
"needs_paint_volume_update", while "paint_volume_valid" is only meant to
store whether the actor has a paint volume to work with.

So rename paint_volume_valid to has_paint_volume to avoid confusion
about which flag is used for caching.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1492>
This commit is contained in:
Jonas Dreßler 2020-11-21 13:22:32 +01:00 committed by Marge Bot
parent 66d8f51da1
commit 675321a2e5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,7 +825,7 @@ struct _ClutterActorPrivate
guint enable_paint_unmapped : 1; guint enable_paint_unmapped : 1;
guint has_key_focus : 1; guint has_key_focus : 1;
guint propagated_one_redraw : 1; guint propagated_one_redraw : 1;
guint paint_volume_valid : 1; guint has_paint_volume : 1;
guint last_paint_volume_valid : 1; guint last_paint_volume_valid : 1;
guint in_clone_paint : 1; guint in_clone_paint : 1;
guint transform_valid : 1; guint transform_valid : 1;
@ -3965,7 +3965,7 @@ clutter_actor_pick (ClutterActor *actor,
/* mark that we are in the paint process */ /* mark that we are in the paint process */
CLUTTER_SET_PRIVATE_FLAGS (actor, CLUTTER_IN_PICK); CLUTTER_SET_PRIVATE_FLAGS (actor, CLUTTER_IN_PICK);
if (should_cull && priv->paint_volume_valid && priv->last_paint_volume_valid) if (should_cull && priv->has_paint_volume && priv->last_paint_volume_valid)
{ {
graphene_box_t box; graphene_box_t box;
@ -15182,14 +15182,14 @@ ensure_paint_volume (ClutterActor *self)
{ {
priv->had_effects_on_last_paint_volume_update = has_paint_volume_override_effects; priv->had_effects_on_last_paint_volume_update = has_paint_volume_override_effects;
if (priv->paint_volume_valid) if (priv->has_paint_volume)
clutter_paint_volume_free (&priv->paint_volume); clutter_paint_volume_free (&priv->paint_volume);
priv->paint_volume_valid = FALSE; priv->has_paint_volume = FALSE;
if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
{ {
priv->paint_volume_valid = TRUE; priv->has_paint_volume = TRUE;
priv->needs_paint_volume_update = FALSE; priv->needs_paint_volume_update = FALSE;
} }
} }
@ -15209,7 +15209,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
ensure_paint_volume (self); ensure_paint_volume (self);
if (priv->paint_volume_valid) if (priv->has_paint_volume)
return &priv->paint_volume; return &priv->paint_volume;
return NULL; return NULL;