Upgrade to ExtJS 3.1.0 - Released 12/16/2009

[extjs.git] / docs / source / ColumnLayout.html
diff --git a/docs/source/ColumnLayout.html b/docs/source/ColumnLayout.html

index 5c2ca15..a401db9 100644 (file)
--- a/docs/source/ColumnLayout.html
+++ b/docs/source/ColumnLayout.html
@@ -1,5 +1,6 @@
  <html>\r
  <head>\r
  <html>\r
  <head>\r
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />    \r
    <title>The source code</title>\r
      <link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />\r
      <script type="text/javascript" src="../resources/prettify/prettify.js"></script>\r
    <title>The source code</title>\r
      <link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />\r
      <script type="text/javascript" src="../resources/prettify/prettify.js"></script>\r
@@ -34,7 +35,7 @@ var p = new Ext.Panel({
      layout:'column',\r
      items: [{\r
          title: 'Column 1',\r
      layout:'column',\r
      items: [{\r
          title: 'Column 1',\r
-        columnWidth: .25 \r
+        columnWidth: .25\r
      },{\r
          title: 'Column 2',\r
          columnWidth: .6\r
      },{\r
          title: 'Column 2',\r
          columnWidth: .6\r
@@ -66,14 +67,17 @@ var p = new Ext.Panel({
  Ext.layout.ColumnLayout = Ext.extend(Ext.layout.ContainerLayout, {\r
      // private\r
      monitorResize:true,\r
  Ext.layout.ColumnLayout = Ext.extend(Ext.layout.ContainerLayout, {\r
      // private\r
      monitorResize:true,\r
-    \r
+\r
      extraCls: 'x-column',\r
  \r
      scrollOffset : 0,\r
  \r
      // private\r
      extraCls: 'x-column',\r
  \r
      scrollOffset : 0,\r
  \r
      // private\r
+\r
+    targetCls: 'x-column-layout-ct',\r
+\r
      isValidParent : function(c, target){\r
      isValidParent : function(c, target){\r
-        return (c.getPositionEl ? c.getPositionEl() : c.getEl()).dom.parentNode == this.innerCt.dom;\r
+        return c.getPositionEl().dom.parentNode == this.innerCt.dom;\r
      },\r
  \r
      // private\r
      },\r
  \r
      // private\r
@@ -81,8 +85,6 @@ Ext.layout.ColumnLayout = Ext.extend(Ext.layout.ContainerLayout, {
          var cs = ct.items.items, len = cs.length, c, i;\r
  \r
          if(!this.innerCt){\r
          var cs = ct.items.items, len = cs.length, c, i;\r
  \r
          if(!this.innerCt){\r
-            target.addClass('x-column-layout-ct');\r
-\r
              // the innerCt prevents wrapping and shuffling while\r
              // the container is resizing\r
              this.innerCt = target.createChild({cls:'x-column-inner'});\r
              // the innerCt prevents wrapping and shuffling while\r
              // the container is resizing\r
              this.innerCt = target.createChild({cls:'x-column-inner'});\r
@@ -90,25 +92,25 @@ Ext.layout.ColumnLayout = Ext.extend(Ext.layout.ContainerLayout, {
          }\r
          this.renderAll(ct, this.innerCt);\r
  \r
          }\r
          this.renderAll(ct, this.innerCt);\r
  \r
-        var size = Ext.isIE && target.dom != Ext.getBody().dom ? target.getStyleSize() : target.getViewSize();\r
+        var size = target.getViewSize(true);\r
  \r
          if(size.width < 1 && size.height < 1){ // display none?\r
              return;\r
          }\r
  \r
  \r
          if(size.width < 1 && size.height < 1){ // display none?\r
              return;\r
          }\r
  \r
-        var w = size.width - target.getPadding('lr') - this.scrollOffset,\r
-            h = size.height - target.getPadding('tb'),\r
+        var w = size.width - this.scrollOffset,\r
+            h = size.height,\r
              pw = w;\r
  \r
          this.innerCt.setWidth(w);\r
              pw = w;\r
  \r
          this.innerCt.setWidth(w);\r
-        \r
+\r
          // some columns can be percentages while others are fixed\r
          // so we need to make 2 passes\r
  \r
          for(i = 0; i < len; i++){\r
              c = cs[i];\r
              if(!c.columnWidth){\r
          // some columns can be percentages while others are fixed\r
          // so we need to make 2 passes\r
  \r
          for(i = 0; i < len; i++){\r
              c = cs[i];\r
              if(!c.columnWidth){\r
-                pw -= (c.getSize().width + c.getEl().getMargins('lr'));\r
+                pw -= (c.getSize().width + c.getPositionEl().getMargins('lr'));\r
              }\r
          }\r
  \r
              }\r
          }\r
  \r
@@ -117,11 +119,11 @@ Ext.layout.ColumnLayout = Ext.extend(Ext.layout.ContainerLayout, {
          for(i = 0; i < len; i++){\r
              c = cs[i];\r
              if(c.columnWidth){\r
          for(i = 0; i < len; i++){\r
              c = cs[i];\r
              if(c.columnWidth){\r
-                c.setSize(Math.floor(c.columnWidth*pw) - c.getEl().getMargins('lr'));\r
+                c.setSize(Math.floor(c.columnWidth * pw) - c.getPositionEl().getMargins('lr'));\r
              }\r
          }\r
      }\r
              }\r
          }\r
      }\r
-    \r
+\r
      <div id="prop-Ext.layout.ColumnLayout-activeItem"></div>/**\r
       * @property activeItem\r
       * @hide\r
      <div id="prop-Ext.layout.ColumnLayout-activeItem"></div>/**\r
       * @property activeItem\r
       * @hide\r