From: Alan Knowles Date: Mon, 6 Aug 2012 05:34:58 +0000 (+0800) Subject: Roo/ContentPanel.js X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=fe2006387080342204f171f798fdf82e1d410cc2;p=roojs1 Roo/ContentPanel.js --- diff --git a/Roo/ContentPanel.js b/Roo/ContentPanel.js index c899e1baf4..ed7e9f1ca2 100644 --- a/Roo/ContentPanel.js +++ b/Roo/ContentPanel.js @@ -283,6 +283,13 @@ panel.load({ height -= te.getHeight(); te.setWidth(width); } + if(this.footer){ + var te = this.footer.getEl(); + height -= te.getHeight(); + te.setWidth(width); + } + + if(this.adjustments){ width += this.adjustments[0]; height += this.adjustments[1]; @@ -391,7 +398,13 @@ layout.addxtype({ addxtype : function(cfg) { // add form.. if (cfg.xtype.match(/^Form$/)) { - var el = this.el.createChild(); + + var el; + if (this.footer) { + el = this.el.insertSibling(this.footer.container, 'before'); + } else { + el = this.el.createChild(); + } this.form = new Roo.form.Form(cfg);