[gnome-shell/wip/paging-release: 13/85] test

[Carlos Soriano <csoriano src gnome org>]

commit 8ef911344319925df2e502da71d01e8429f8f1b2
Author: Carlos Soriano <carlos soriano89 gmail com>
Date:   Mon Jul 1 16:52:44 2013 +0200

    test

 js/ui/appDisplay.js |    3 ++-
 js/ui/iconGrid.js   |   26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index e7994d7..75b13b0 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -254,6 +254,7 @@ const AppPages = new Lang.Class({
         this._parent.addFolderPopup(popup);
     }
 });
+
 const PaginationScrollView = new Lang.Class({
     Name: 'PaginationScrollView',
     Extends: St.ScrollView,
@@ -411,7 +412,7 @@ const PaginationScrollView = new Lang.Class({
     },
     
     addFolderPopup: function(popup) {
-        popup.actor.set_width(1100);
+        //popup.actor.set_width(1100);
         this._stack.add_actor(popup.actor);
         popup.connect('open-state-changed', Lang.bind(this,
                 function(popup, isOpen) {
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 8d8ef05..654aede 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -251,7 +251,7 @@ const IconGrid = new Lang.Class({
             nColumns = children.length;
             spacing = this._spacing;
         } else {
-            [nColumns, , spacing] = this._computeLayoutOld(forWidth);
+            [nColumns, , spacing] = this._computeLayoutOldOld(forWidth);
         }
 
         let nRows;
@@ -264,7 +264,9 @@ const IconGrid = new Lang.Class({
         let totalSpacing = Math.max(0, nRows - 1) * spacing;
         let height = nRows * this._vItemSize + totalSpacing;
         
-        /*if(this._usePagination) {
+        global.log("Old spacing " + spacing);
+        global.log("Old for width  " + forWidth);
+        if(this._usePagination) {
             
             this._spacePerRow = this._vItemSize + spacing;
             this._rowsPerPage = Math.floor(this._parentSize[1] / this._spacePerRow);
@@ -275,7 +277,7 @@ const IconGrid = new Lang.Class({
             alloc.min_size = this._rowsPerPage * this._spacePerRow * this._nPages + spaceBetweenPagesTotal;
             alloc.natural_size = this._rowsPerPage * this._spacePerRow * this._nPages + 
spaceBetweenPagesTotal;
             return;
-        }*/
+        }
         alloc.min_size = height;
         alloc.natural_size = height;
     },
@@ -291,14 +293,16 @@ const IconGrid = new Lang.Class({
         let children = this._getVisibleChildren();
         let availWidth = box.x2 - box.x1;
         let availHeight = box.y2 - box.y1;
-        let [nColumns, usedWidth, spacing] = this._computeLayoutOld(availWidth);
+        let [nColumns, usedWidth, spacing] = this._computeLayoutOldOld(availWidth);
         this._computedSpacing = spacing;
-        if(this._fixedSpacing)
-            spacing = this._fixedSpacing;
-        this._usedWidth = usedWidth;
+        global.log("new spacing " + spacing);
+        global.log("new forwidth " + availWidth);
         if(this._usePagination) {
+            let oldSpaceBetweenPages = this._spaceBetweenPages;
+            let oldNPages = this._nPages;
             //Recalculate the space between pages with the new spacing
             this._spaceBetweenPages = this._parentSize[1] - (this._rowsPerPage * (this._vItemSize + 
spacing));
+            
         }
 
         let leftPadding;
@@ -419,17 +423,11 @@ const IconGrid = new Lang.Class({
         let nColumns = 0;
         let usedWidth = 0;
         let spacing = this._spacing;
-        if(this._fixedSpacing) {
-            spacing = this._fixedSpacing;
-        }
         if (this._colLimit) {
             let itemWidth = this._hItemSize * this._colLimit;
             let emptyArea = forWidth - itemWidth;
             spacing = Math.max(this._spacing, emptyArea / (2 * this._colLimit));
-            if(this._fixedSpacing) {
-                spacing = this._fixedSpacing;
-            }
-            // We have to care that new spacing must not change number of rows per page.
+           // We have to care that new spacing must not change number of rows per page.
             if(this._usePagination) {
                 let spaceBetweenPages = this._parentSize[1] - (this._rowsPerPage * (this._vItemSize + 
spacing));
                 if(spaceBetweenPages < 0) {