[clutter/clutter-1.6] clutter-offscreen-effect: use target size when setting up the viewport



commit 3dc3f8ea154c3a65765a24e5c41eb5f646ad2641
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date:   Fri May 20 11:15:07 2011 +0200

    clutter-offscreen-effect: use target size when setting up the viewport
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650650
    (cherry picked from commit e59fff7a3f2d490b7a9b8dc8e149dfc20831a141)
    
    Signed-off-by: Emmanuele Bassi <ebassi linux intel com>

 clutter/clutter-offscreen-effect.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter-offscreen-effect.c b/clutter/clutter-offscreen-effect.c
index 27edd56..4ad16c7 100644
--- a/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter-offscreen-effect.c
@@ -258,14 +258,14 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
   xexpand = 0.f;
   if (priv->x_offset < 0.f)
     xexpand = -priv->x_offset;
-  if (priv->x_offset + fbo_width > width)
-    xexpand = MAX (xexpand, (priv->x_offset + fbo_width) - width);
+  if (priv->x_offset + priv->target_width > width)
+    xexpand = MAX (xexpand, (priv->x_offset + priv->target_width) - width);
 
   yexpand = 0.f;
   if (priv->y_offset < 0.f)
     yexpand = -priv->y_offset;
-  if (priv->y_offset + fbo_height > height)
-    yexpand = MAX (yexpand, (priv->y_offset + fbo_height) - height);
+  if (priv->y_offset + priv->target_height > height)
+    yexpand = MAX (yexpand, (priv->y_offset + priv->target_height) - height);
 
   /* Set the viewport */
   cogl_set_viewport (-(priv->x_offset + xexpand), -(priv->y_offset + yexpand),



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]