Changeset 13740

Timestamp:

05/15/08 10:43:28 (2 months ago)

Author:

bill

Message:

Fix bug w/doLayout=true mode where it would effectively double the ContentPane?'s padding, but setting a style="left: 5px; top: 5px;" on the child even though it isn't position:absolute.

Refs #6438. !strict

Files:

• dijit/trunk/layout/ContentPane.js (modified) (2 diffs)

dijit/trunk/layout/ContentPane.js

@@ -193 +193 @@
                         if(this._singleChild && this._singleChild.resize){
                                 this._singleChild.startup();
-                                this._singleChild.resize(this._contentBox || dojo.contentBox(this.containerNode));
+                                var cb = this._contentBox || dojo.contentBox(this.containerNode);
+                                this._singleChild.resize({w: cb.w, h: cb.h});
                         }
                 }
@@ -230 +231 @@
                         mb = dojo.mixin(dojo.marginBox(node), size||{});
 
-                this._contentBox = dijit.layout.marginBox2contentBox(node, mb);
+                var cb = this._contentBox = dijit.layout.marginBox2contentBox(node, mb);
 
                 // If we have a single widget child then size it to fit snugly within my borders
                 if(this._singleChild && this._singleChild.resize){
-                        this._singleChild.resize(this._contentBox);
+                        // note: if widget has padding this._contentBox will have l and t set,
+                        // but don't pass them to resize() or it will doubly-offset the child
+                        this._singleChild.resize({w: cb.w, h: cb.h});
                 }
         },