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 3.1.1 - Released 02/08/2010
[extjs.git]
/
src
/
widgets
/
layout
/
FitLayout.js
diff --git
a/src/widgets/layout/FitLayout.js
b/src/widgets/layout/FitLayout.js
index
10bb436
..
df67bed
100644
(file)
--- a/
src/widgets/layout/FitLayout.js
+++ b/
src/widgets/layout/FitLayout.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.1.
0
- * Copyright(c) 2006-20
09
Ext JS, LLC
+ * Ext JS Library 3.1.
1
+ * Copyright(c) 2006-20
10
Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-29,11
+29,22
@@
Ext.layout.FitLayout = Ext.extend(Ext.layout.ContainerLayout, {
// private
\r
monitorResize:true,
\r
\r
// private
\r
monitorResize:true,
\r
\r
+ type: 'fit',
\r
+
\r
+ getLayoutTargetSize : function() {
\r
+ var target = this.container.getLayoutTarget();
\r
+ if (!target) {
\r
+ return {};
\r
+ }
\r
+ // Style Sized (scrollbars not included)
\r
+ return target.getStyleSize();
\r
+ },
\r
+
\r
// private
\r
onLayout : function(ct, target){
\r
Ext.layout.FitLayout.superclass.onLayout.call(this, ct, target);
\r
// private
\r
onLayout : function(ct, target){
\r
Ext.layout.FitLayout.superclass.onLayout.call(this, ct, target);
\r
- if(!
this.container
.collapsed){
\r
- this.setItemSize(this.activeItem || ct.items.itemAt(0), t
arget.getViewSize(true
));
\r
+ if(!
ct
.collapsed){
\r
+ this.setItemSize(this.activeItem || ct.items.itemAt(0), t
his.getLayoutTargetSize(
));
\r
}
\r
},
\r
\r
}
\r
},
\r
\r