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

actor: Be more conservative with the default paint volume

Browse Source 
Check the allocation, when one is being used to initialize the paint
volume.
This commit is contained in:
Emmanuele Bassi 2012-01-18 16:05:12 +00:00
parent eafb0ee734
commit 70679dc68c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/clutter-actor.c
View File

@ -4365,6 +4365,8 @@ clutter_actor_real_get_paint_volume (ClutterActor *self,
ClutterActor *child;
gboolean res;
clutter_paint_volume_set_from_allocation (volume, self);
/* this is the default return value: we cannot know if a class
* is going to paint outside its allocation, so we take the
* conservative approach.
@ -4377,11 +4379,20 @@ clutter_actor_real_get_paint_volume (ClutterActor *self,
*/
if (priv->clip_to_allocation)
{
clutter_paint_volume_set_from_allocation (volume, self);
float w, h;
res = TRUE;
w = h = 0.f;
clutter_actor_box_get_size (&priv->allocation, &w, &h);
if (w >= 0 && h >= 0)
{
clutter_paint_volume_set_from_allocation (volume, self);
res = TRUE;
}
}
else if (priv->has_clip)
else if (priv->has_clip &&
priv->clip.width >= 0 &&
priv->clip.height >= 0)
{
ClutterVertex origin;