From 570fa3f0442d528af8aa50114fc79085c541b661 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Sat, 11 Sep 2010 02:31:03 +0100
Subject: [PATCH] clone: scale src with apply_transform not cogl_scale

Since a ClutterClone may be allocated a different size than its source
actor we need to apply a scale factor before painting the source actor.
We were manually using cogl_scale to do this in clutter_clone_paint but
really this kind of thing is best handled in an implementation of the
apply_transform virtual so Clutter can be aware of the transform for
other purposes, such as input transformations. Also we want to provide
an implementation of the get_paint_volume virtual where Clutter will
also expect to be able to use the apply_transform virtual to transform
the volume into its parent's coordinate space.
---
 clutter/clutter-clone.c | 46 +++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/clutter/clutter-clone.c b/clutter/clutter-clone.c
index 075bff397..9f36f76eb 100644
--- a/clutter/clutter-clone.c
+++ b/clutter/clutter-clone.c
@@ -119,13 +119,40 @@ clutter_clone_get_preferred_height (ClutterActor *self,
                                         natural_height_p);
 }
 
+static void
+clutter_clone_apply_transform (ClutterActor *self, CoglMatrix *matrix)
+{
+  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
+  ClutterGeometry geom;
+  ClutterGeometry source_geom;
+  gfloat x_scale;
+  gfloat y_scale;
+
+  /* First chain up and apply all the standard ClutterActor
+   * transformations... */
+  CLUTTER_ACTOR_CLASS (clutter_clone_parent_class)->apply_transform (self,
+                                                                     matrix);
+
+  /* get our allocated size */
+  clutter_actor_get_allocation_geometry (self, &geom);
+
+  /* and get the allocated size of the source */
+  clutter_actor_get_allocation_geometry (priv->clone_source, &source_geom);
+
+  /* We need to scale what the clone-source actor paints to fill our own
+   * allocation...
+   */
+  x_scale = (gfloat) geom.width  / source_geom.width;
+  y_scale = (gfloat) geom.height / source_geom.height;
+
+  cogl_matrix_scale (matrix, x_scale, y_scale, x_scale);
+}
+
 static void
 clutter_clone_paint (ClutterActor *self)
 {
   ClutterClone *clone = CLUTTER_CLONE (self);
   ClutterClonePrivate *priv = clone->priv;
-  ClutterGeometry geom, clone_geom;
-  gfloat x_scale, y_scale;
   gboolean was_unmapped = FALSE;
 
   if (G_UNLIKELY (priv->clone_source == NULL))
@@ -136,20 +163,6 @@ clutter_clone_paint (ClutterActor *self)
 		clutter_actor_get_name (self) ? clutter_actor_get_name (self)
                                               : "unknown");
 
-  /* get our allocated size */
-  clutter_actor_get_allocation_geometry (self, &geom);
-
-  /* and get the allocated size of the source */
-  clutter_actor_get_allocation_geometry (priv->clone_source, &clone_geom);
-
-  /* We need to scale what the clone-source actor paints to fill our own
-   * allocation...
-   */
-  x_scale = (gfloat) geom.width  / clone_geom.width;
-  y_scale = (gfloat) geom.height / clone_geom.height;
-
-  cogl_scale (x_scale, y_scale, 1.0);
-
   /* The final bits of magic:
    * - We need to make sure that when the clone-source actor's paint
    *   method calls clutter_actor_get_paint_opacity, it traverses to
@@ -258,6 +271,7 @@ clutter_clone_class_init (ClutterCloneClass *klass)
 
   g_type_class_add_private (gobject_class, sizeof (ClutterClonePrivate));
 
+  actor_class->apply_transform      = clutter_clone_apply_transform;
   actor_class->paint                = clutter_clone_paint;
   actor_class->get_preferred_width  = clutter_clone_get_preferred_width;
   actor_class->get_preferred_height = clutter_clone_get_preferred_height;