mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05:00
actor: Only care about a child's paint volume when clip_to_allocation isn't set
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:
parent
b5aa666dcd
commit
8512dd2336
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user