git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 4.0.2 - Released 06/09/2011
[extjs.git]
/
docs
/
source
/
Box.html
diff --git
a/docs/source/Box.html
b/docs/source/Box.html
index
d6b204a
..
a9a27f2
100644
(file)
--- a/
docs/source/Box.html
+++ b/
docs/source/Box.html
@@
-133,8
+133,6
@@
Ext.define('Ext.layout.container.Box', {
bindToOwnerCtContainer: true,
bindToOwnerCtContainer: true,
- fixedLayout: false,
-
// availableSpaceOffset is used to adjust the availableWidth, typically used
// to reserve space for a scrollbar
availableSpaceOffset: 0,
// availableSpaceOffset is used to adjust the availableWidth, typically used
// to reserve space for a scrollbar
availableSpaceOffset: 0,
@@
-183,11
+181,12
@@
Ext.define('Ext.layout.container.Box', {
*/
getChildBox: function(child) {
child = child.el || this.owner.getComponent(child).el;
*/
getChildBox: function(child) {
child = child.el || this.owner.getComponent(child).el;
+ var size = child.getBox(false, true);
return {
return {
- left:
child.getLeft(true)
,
- top:
child.getTop(true)
,
- width:
child.getWidth()
,
- height:
child.getHeight()
+ left:
size.left
,
+ top:
size.top
,
+ width:
size.width
,
+ height:
size.height
};
},
};
},
@@
-244,6
+243,8
@@
Ext.define('Ext.layout.container.Box', {
paddingPerpendicular = perpendicularOffset + padding[me.perpendicularRightBottom],
availPerpendicularSize = mmax(0, perpendicularSize - paddingPerpendicular),
paddingPerpendicular = perpendicularOffset + padding[me.perpendicularRightBottom],
availPerpendicularSize = mmax(0, perpendicularSize - paddingPerpendicular),
+ innerCtBorderWidth = me.innerCt.getBorderWidth(me.perpendicularLT + me.perpendicularRB),
+
isStart = me.pack == 'start',
isCenter = me.pack == 'center',
isEnd = me.pack == 'end',
isStart = me.pack == 'start',
isCenter = me.pack == 'center',
isEnd = me.pack == 'end',
@@
-469,7
+470,7
@@
Ext.define('Ext.layout.container.Box', {
// When calculating a centered position within the content box of the innerCt, the width of the borders must be subtracted from
// the size to yield the space available to center within.
// The updateInnerCtSize method explicitly adds the border widths to the set size of the innerCt.
// When calculating a centered position within the content box of the innerCt, the width of the borders must be subtracted from
// the size to yield the space available to center within.
// The updateInnerCtSize method explicitly adds the border widths to the set size of the innerCt.
- diff = mmax(availPerpendicularSize, maxSize) -
me.innerCt.getBorderWidth(me.perpendicularLT + me.perpendicularRB)
- calcs[perpendicularPrefix];
+ diff = mmax(availPerpendicularSize, maxSize) -
innerCtBorderWidth
- calcs[perpendicularPrefix];
if (diff > 0) {
calcs[me.perpendicularLeftTop] = perpendicularOffset + Math.round(diff / 2);
}
if (diff > 0) {
calcs[me.perpendicularLeftTop] = perpendicularOffset + Math.round(diff / 2);
}
@@
-562,7
+563,7
@@
Ext.define('Ext.layout.container.Box', {
}
if (results.recalculate) {
}
if (results.recalculate) {
- items = me.getVisibleItems(
owner
);
+ items = me.getVisibleItems();
calcs = me.calculateChildBoxes(items, targetSize);
boxes = calcs.boxes;
}
calcs = me.calculateChildBoxes(items, targetSize);
boxes = calcs.boxes;
}