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

clutter-offscreen-effect: Use 0,0 as the offset if no actor box

Browse Source 
clutter_offscreen_effect_pre_paint was using the unitialized value of
the ‘box’ variable whenever the actor doesn't have a paint
volume. This patch makes it just set the offset to 0,0 instead.
This commit is contained in:
Neil Roberts 2011-03-04 17:04:02 +00:00
parent d306b4bb7d
commit 9e11aa3820
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-offscreen-effect.c
View File

@ -211,13 +211,18 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
* we need to redirect its rendering offscreen and its position will * we need to redirect its rendering offscreen and its position will
* be used to setup an offset viewport */ * be used to setup an offset viewport */
if (clutter_actor_get_paint_box (priv->actor, &box)) if (clutter_actor_get_paint_box (priv->actor, &box))
clutter_actor_box_get_size (&box, &fbo_width, &fbo_height); {
clutter_actor_box_get_size (&box, &fbo_width, &fbo_height);
clutter_actor_box_get_origin (&box, &priv->x_offset, &priv->y_offset);
}
else else
{ {
/* If we can't get a valid paint box then we fallback to /* If we can't get a valid paint box then we fallback to
* creating a full stage size fbo. */ * creating a full stage size fbo. */
ClutterActor *stage = _clutter_actor_get_stage_internal (priv->actor); ClutterActor *stage = _clutter_actor_get_stage_internal (priv->actor);
clutter_actor_get_size (stage, &fbo_width, &fbo_height); clutter_actor_get_size (stage, &fbo_width, &fbo_height);
priv->x_offset = 0.0f;
priv->y_offset = 0.0f;
} }
/* First assert that the framebuffer is the right size... */ /* First assert that the framebuffer is the right size... */
@ -236,7 +241,6 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
* but offset it so that the actor of interest lands on our * but offset it so that the actor of interest lands on our
* framebuffer. */ * framebuffer. */
clutter_actor_get_size (priv->stage, &width, &height); clutter_actor_get_size (priv->stage, &width, &height);
clutter_actor_box_get_origin (&box, &priv->x_offset, &priv->y_offset);
/* Expand the viewport if the actor is partially off-stage, /* Expand the viewport if the actor is partially off-stage,
* otherwise the actor will end up clipped to the stage viewport * otherwise the actor will end up clipped to the stage viewport