brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actor: Only care about a child's paint volume when clip_to_allocation isn't set

Browse Source 
If we're clipping to the allocation, then the child can paint wherever it
wants, and we don't care. The paint volume is the allocation here.
This commit is contained in:
Jasper St. Pierre 2012-02-13 12:43:08 -05:00 committed by Emmanuele Bassi
parent b5aa666dcd
commit 8512dd2336
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter-actor.c
View File

@ -4705,7 +4705,9 @@ clutter_actor_real_get_paint_volume (ClutterActor *self,
*/ */
res = TRUE; res = TRUE;
} }
else if (priv->has_clip && else
{
if (priv->has_clip &&
priv->clip.width >= 0 && priv->clip.width >= 0 &&
priv->clip.height >= 0) priv->clip.height >= 0)
{ {
@ -4746,6 +4748,7 @@ clutter_actor_real_get_paint_volume (ClutterActor *self,
clutter_paint_volume_union (volume, child_volume); clutter_paint_volume_union (volume, child_volume);
res = TRUE; res = TRUE;
} }
}
return res; return res;
} }