[gnome-shell/wip/swarm] A nice commit message =)

[Carlos Soriano <csoriano src gnome org>]

commit efb4783549341e746a8180dc7bac7c1847e35e1c
Author: Carlos Soriano <carlos soriano89 gmail com>
Date:   Tue Jun 10 11:43:49 2014 +0200

    A nice commit message =)

 js/ui/iconGrid.js |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 9bbe54c..a4c3bb8 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -423,7 +423,8 @@ const IconGrid = new Lang.Class({
 
             itemClone.actor.reactive = false;
             itemClone.actor.set_position(originalX, originalY);
-            itemClone.icon.icon.set_size(0, 0);
+            itemClone.actor.set_scale(0, 0);
+            itemClone.actor.set_pivot_point(0.5, 0.5);
             // Force to use the current size, so the label and the container
             // of the actor doesnn't resize while the icon texture is 
             // animating. That avoids to see the label wrapping the text and
@@ -435,18 +436,18 @@ const IconGrid = new Lang.Class({
             // Defeat onComplete anonymous function closure
             let item = items[index];
             let isLastItem = index == items.length - 1;
-            Tweener.addTween(itemClone.icon.icon,
+            Tweener.addTween(itemClone.actor,
                             { time: ANIMATION_TIME_TYPE_APPEAR / 4,
                               transition: 'easeInOutQuad',
                               delay: delay,
-                              width: originalIconSize * ANIMATION_APPEAR_ICON_SCALE,
-                              height: originalIconSize * ANIMATION_APPEAR_ICON_SCALE,
+                              scale_x: ANIMATION_APPEAR_ICON_SCALE,
+                              scale_y: ANIMATION_APPEAR_ICON_SCALE,
                               onComplete: Lang.bind(this, function() {
-                                  Tweener.addTween(itemClone.icon.icon,
+                                  Tweener.addTween(itemClone.actor,
                                                    { time: ANIMATION_TIME_TYPE_APPEAR - 
ANIMATION_TIME_TYPE_APPEAR / 4,
                                                      transition: 'easeInOutQuad',
-                                                     width: originalIconSize,
-                                                     height: originalIconSize,
+                                                     scale_x: 1,
+                                                     scale_y: 1,
                                                      onComplete: Lang.bind(this, function() {
                                                         if (isLastItem)
                                                             this._animating = false;
@@ -512,7 +513,9 @@ const IconGrid = new Lang.Class({
             Main.uiGroup.add_actor(itemClone.actor);
 
             itemClone.actor.reactive = false;
-            //itemClone.actor.set_size(sourceSize, sourceSize);
+            let scale = sourceSize[0] / items[index].actor.get_transformed_size()[0];
+            itemClone.actor.set_pivot_point(0.5, 0.5);
+
             // Defeat onComplete anonymous function closure
             let item = items[index];
             let isLastItem = index == items.length - 1;
@@ -521,7 +524,7 @@ const IconGrid = new Lang.Class({
             if (animationDirection == ANIMATION_DIRECTION_IN) {
                 itemClone.actor.set_position(sourcePosition[0], sourcePosition[1]);
                 itemClone.actor.opacity = 0;
-
+                itemClone.actor.set_scale(scale, scale);
                 let delay = (1 - (distances[index] - minDist) / normalization) * 
ANIMATION_MAX_DELAY_FOR_ITEM;
                 let [finalX, finalY]  = items[index].actor.get_transformed_position();
                 movementParams = { time: ANIMATION_TIME_IN,
@@ -529,6 +532,8 @@ const IconGrid = new Lang.Class({
                                    delay: delay,
                                    x: finalX,
                                    y: finalY,
+                                   scale_x: 1,
+                                   scale_y: 1,
                                    onComplete: Lang.bind(this, function() {
                                        if (isLastItem)
                                            this._animating = false;
@@ -550,6 +555,8 @@ const IconGrid = new Lang.Class({
                                    delay: delay,
                                    x: finalX,
                                    y: finalY,
+                                   scale_x: scale,
+                                   scale_y: scale,
                                    onComplete: Lang.bind(this, function() {
                                        if (isLastItem)
                                            this._animating = false;