[qooxdoo-commit] SF.net SVN: qooxdoo: [11221] trunk/qooxdoo/frontend

[<fj...@us...>]

Revision: 11221
          http://qooxdoo.svn.sourceforge.net/qooxdoo/?rev=11221&view=rev
Author:   fjakobs
Date:     2008-01-18 07:23:13 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
some grid updates

Modified Paths:
--------------
    trunk/qooxdoo/frontend/application/demobrowser/source/html/ui/GridLayout_2.html
    trunk/qooxdoo/frontend/framework/source/class/qx/ui2/layout/Grid.js

Modified: trunk/qooxdoo/frontend/application/demobrowser/source/html/ui/GridLayout_2.html
===================================================================
--- trunk/qooxdoo/frontend/application/demobrowser/source/html/ui/GridLayout_2.html	2008-01-18 15:15:10 UTC (rev 11220)
+++ trunk/qooxdoo/frontend/application/demobrowser/source/html/ui/GridLayout_2.html	2008-01-18 15:23:13 UTC (rev 11221)
@@ -37,7 +37,7 @@
       doc.setBackgroundColor("white");
 
       var border = new qx.ui2.decoration.Basic(1, "solid", "black");
-
+/*
       // auto size
       var box1 = (new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "yellow"});
       var layout1 = new qx.ui2.layout.Grid();
@@ -49,7 +49,7 @@
 
       box1.setLayout(layout1);
       doc.add(box1, 20, 10);
-
+*/
       // flex columns
       var box1 = (new qx.ui2.core.Widget).set({
         decoration: border,
@@ -70,14 +70,14 @@
 
 
       layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 0, 0);
-      layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 0, 1, 1, 2);
+      layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 0, 1, {rowSpan: 1, colSpan: 2});
       layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 1, 0);
 
       var container = (new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "orange", width:400, padding: 5});
-      layout1.add(container, 1, 1, 2, 2);
+      layout1.add(container, 1, 1, {rowSpan: 2, colSpan: 2});
 
       layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 2, 0);
-      layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 3, 0, 1, 2);
+      layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 3, 0, {rowSpan: 1, colSpan: 2});
       layout1.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green"}), 3, 2);
 
       box1.setLayout(layout1);
@@ -97,7 +97,7 @@
       innerLayout.add((new qx.ui2.core.Widget).set({decoration: border, backgroundColor: "green", minWidth:170}), 2, 0);//, 1, 2);
 
 
-      doc.add(box1, 260, 10);
+      doc.add(box1, {left: 260, top: 10});
     }
   }
 });

Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui2/layout/Grid.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/ui2/layout/Grid.js	2008-01-18 15:15:10 UTC (rev 11220)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/ui2/layout/Grid.js	2008-01-18 15:23:13 UTC (rev 11221)
@@ -431,7 +431,7 @@
     getColumnFlex : function(column)
     {
       var colData = this._colData[column] || {};
-      return colData.flex !== undefined ? colData.flex : 0;
+      return colData.flex !== undefined ? colData.flex : 1;
     },
 
 
@@ -460,7 +460,7 @@
     getRowFlex : function(row)
     {
       var rowData = this._rowData[row] || {};
-      return rowData.flex !== undefined ? rowData.flex : 0;
+      return rowData.flex !== undefined ? rowData.flex : 1;
     },
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.