[Qooxdoo-commit] qooxdoo/source/script/layouts QxGridLayoutImpl.js,1.1.2.15,1.1.2.16

[Sebastian W. <wp...@us...>]

Update of /cvsroot/qooxdoo/qooxdoo/source/script/layouts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11479/source/script/layouts

Modified Files:
      Tag: renderer
	QxGridLayoutImpl.js 
Log Message:
Improved grid layout and depending widgets, changed usage of alowStretchX and allowStretchY inside the grid layout, modified appearance to fix some bugs through the new behaviour

Index: QxGridLayoutImpl.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/layouts/Attic/QxGridLayoutImpl.js,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- QxGridLayoutImpl.js	16 Jan 2006 16:11:56 -0000	1.1.2.15
+++ QxGridLayoutImpl.js	26 Jan 2006 08:54:44 -0000	1.1.2.16
@@ -77,7 +77,6 @@
 {
   var vWidget = this.getWidget();
   var vColWidth = vWidget.getColumnInnerWidth(vChild._col, vChild._row);
-  var vSetupWidth = vChild.getWidthValue();
   
   // extend colwidth to spanned area
   if (vWidget.isSpanStart(vChild._col, vChild._row))
@@ -99,11 +98,7 @@
     };
   };
   
-  if (vSetupWidth == null && vChild.getAllowStretchX()) {
-    return vColWidth;
-  };
-  
-  return Math.min(vSetupWidth, vColWidth);
+  return vChild.getAllowStretchX() ? vColWidth : Math.min(vChild.getWidthValue(), vColWidth);
 };
 
 /*!
@@ -113,7 +108,6 @@
 {
   var vWidget = this.getWidget();
   var vRowHeight = vWidget.getRowInnerHeight(vChild._col, vChild._row);
-  var vSetupHeight = vChild.getHeightValue();
   
   // extend colwidth to spanned area
   if (vWidget.isSpanStart(vChild._col, vChild._row))
@@ -135,11 +129,7 @@
     };
   };
 
-  if (vSetupHeight == null && vChild.getAllowStretchY()) {
-    return vRowHeight;
-  };
-  
-  return Math.min(vSetupHeight, vRowHeight);
+  return vChild.getAllowStretchY() ? vRowHeight : Math.min(vChild.getHeightValue(), vRowHeight);
 };