From: Alan Knowles <alan@roojs.com>
Date: Fri, 5 Feb 2021 08:06:54 +0000 (+0800)
Subject: fix layout height calc
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=ade0163e06142faa1968a52568612dc4d2525bc2

fix layout height calc
---

diff --git a/docs/src/Roo_bootstrap_layout_Border.js.html b/docs/src/Roo_bootstrap_layout_Border.js.html
index cb15bb03d5..9647fe48aa 100644
--- a/docs/src/Roo_bootstrap_layout_Border.js.html
+++ b/docs/src/Roo_bootstrap_layout_Border.js.html
@@ -38,7 +38,7 @@ the container size if it is not the body element.&lt;/b&gt;
 
 };
 
-</span><span class="jsdoc-var">Roo.bootstrap.layout.Border.regions </span><span class="jsdoc-syntax">=  [</span><span class="jsdoc-string">&quot;north&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;south&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;east&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;west&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;center&quot;</span><span class="jsdoc-syntax">];
+</span><span class="jsdoc-var">Roo.bootstrap.layout.Border.regions </span><span class="jsdoc-syntax">=  [</span><span class="jsdoc-string">&quot;center&quot;</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">&quot;north&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;south&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;east&quot;</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">&quot;west&quot;</span><span class="jsdoc-syntax">];
 
 </span><span class="jsdoc-var">Roo.extend</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.bootstrap.layout.Border</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">Roo.bootstrap.layout.Manager</span><span class="jsdoc-syntax">, {
 
diff --git a/docs/src/Roo_bootstrap_layout_East.js.html b/docs/src/Roo_bootstrap_layout_East.js.html
index 66b881ec7e..52992cab10 100644
--- a/docs/src/Roo_bootstrap_layout_East.js.html
+++ b/docs/src/Roo_bootstrap_layout_East.js.html
@@ -8,13 +8,21 @@
         </span><span class="jsdoc-var">this.split.orientation </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Roo.bootstrap.SplitBar.HORIZONTAL</span><span class="jsdoc-syntax">;
         </span><span class="jsdoc-var">this.split.el.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;roo-layout-split-h&quot;</span><span class="jsdoc-syntax">);
     }
-    </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">config.initialSize </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">config.width</span><span class="jsdoc-syntax">;
-    </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">&quot;undefined&quot;</span><span class="jsdoc-syntax">){
-        </span><span class="jsdoc-var">this.el.setWidth</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">);
-    }
+
 };
 </span><span class="jsdoc-var">Roo.extend</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.bootstrap.layout.East</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">Roo.bootstrap.layout.Split</span><span class="jsdoc-syntax">, {
     </span><span class="jsdoc-var">orientation</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">Roo.bootstrap.SplitBar.HORIZONTAL</span><span class="jsdoc-syntax">,
+
+    </span><span class="jsdoc-var">onRender </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ctr</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">)
+    {
+        </span><span class="jsdoc-var">Roo.bootstrap.layout.Split.prototype.onRender.call</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">ctr</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.config.initialSize </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">this.config.width</span><span class="jsdoc-syntax">;
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.el </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">&quot;undefined&quot;</span><span class="jsdoc-syntax">){
+            </span><span class="jsdoc-var">this.el.setWidth</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">);
+        }
+
+    },
+
     </span><span class="jsdoc-var">getBox </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.collapsed</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">this.collapsedEl.getBox</span><span class="jsdoc-syntax">();
diff --git a/docs/src/Roo_bootstrap_layout_North.js.html b/docs/src/Roo_bootstrap_layout_North.js.html
index 0825b1ffd2..6395f36d01 100644
--- a/docs/src/Roo_bootstrap_layout_North.js.html
+++ b/docs/src/Roo_bootstrap_layout_North.js.html
@@ -16,16 +16,25 @@
         </span><span class="jsdoc-var">this.split.orientation </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Roo.bootstrap.SplitBar.VERTICAL</span><span class="jsdoc-syntax">;
         </span><span class="jsdoc-var">this.split.el.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;roo-layout-split-v&quot;</span><span class="jsdoc-syntax">);
     }
-    </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">config.initialSize </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">config.height</span><span class="jsdoc-syntax">;
-    </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">&quot;undefined&quot;</span><span class="jsdoc-syntax">){
-        </span><span class="jsdoc-var">this.el.setHeight</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">);
-    }
-};
+    </span><span class="jsdoc-comment">//var size = config.initialSize || config.height;
+    //if(this.el &amp;&amp; typeof size != &quot;undefined&quot;){
+    //    this.el.setHeight(size);
+    //}
+</span><span class="jsdoc-syntax">};
 </span><span class="jsdoc-var">Roo.extend</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.bootstrap.layout.North</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">Roo.bootstrap.layout.Split</span><span class="jsdoc-syntax">,
 {
     </span><span class="jsdoc-var">orientation</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">Roo.bootstrap.SplitBar.VERTICAL</span><span class="jsdoc-syntax">,
 
 
+    </span><span class="jsdoc-var">onRender </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ctr</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">)
+    {
+        </span><span class="jsdoc-var">Roo.bootstrap.layout.Split.prototype.onRender.call</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">ctr</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.config.initialSize </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">this.config.height</span><span class="jsdoc-syntax">;
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.el </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">&quot;undefined&quot;</span><span class="jsdoc-syntax">){
+            </span><span class="jsdoc-var">this.el.setHeight</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">);
+        }
+
+    },
 
     </span><span class="jsdoc-var">getBox </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.collapsed</span><span class="jsdoc-syntax">){
diff --git a/docs/src/Roo_bootstrap_layout_South.js.html b/docs/src/Roo_bootstrap_layout_South.js.html
index 1fc7bfa72b..f9316e9b77 100644
--- a/docs/src/Roo_bootstrap_layout_South.js.html
+++ b/docs/src/Roo_bootstrap_layout_South.js.html
@@ -11,14 +11,22 @@
         </span><span class="jsdoc-var">this.split.orientation </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Roo.bootstrap.SplitBar.VERTICAL</span><span class="jsdoc-syntax">;
         </span><span class="jsdoc-var">this.split.el.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;roo-layout-split-v&quot;</span><span class="jsdoc-syntax">);
     }
-    </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">config.initialSize </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">config.height</span><span class="jsdoc-syntax">;
-    </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">&quot;undefined&quot;</span><span class="jsdoc-syntax">){
-        </span><span class="jsdoc-var">this.el.setHeight</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">);
-    }
+
 };
 
 </span><span class="jsdoc-var">Roo.extend</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.bootstrap.layout.South</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">Roo.bootstrap.layout.Split</span><span class="jsdoc-syntax">, {
     </span><span class="jsdoc-var">orientation</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">Roo.bootstrap.SplitBar.VERTICAL</span><span class="jsdoc-syntax">,
+
+    </span><span class="jsdoc-var">onRender </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ctr</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">)
+    {
+        </span><span class="jsdoc-var">Roo.bootstrap.layout.Split.prototype.onRender.call</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">ctr</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.config.initialSize </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">this.config.height</span><span class="jsdoc-syntax">;
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.el </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">!= </span><span class="jsdoc-string">&quot;undefined&quot;</span><span class="jsdoc-syntax">){
+            </span><span class="jsdoc-var">this.el.setHeight</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">);
+        }
+
+    },
+
     </span><span class="jsdoc-var">getBox </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.collapsed</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">this.collapsedEl.getBox</span><span class="jsdoc-syntax">();