X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/3789b528d8dd8aad4558e38e22d775bcab1cbd36..f562e4c6e5fac7bcb445985b99acbea4d706e6f0:/docs/source/Button2.html
diff --git a/docs/source/Button2.html b/docs/source/Button2.html
index 148b94d6..14f9eb82 100644
--- a/docs/source/Button2.html
+++ b/docs/source/Button2.html
@@ -3,8 +3,8 @@
The source code
-
-
+
+
@@ -51,6 +51,8 @@ Ext.define('Ext.layout.component.Button', {
ownerEl = owner.el,
btnEl = owner.btnEl,
btnInnerEl = owner.btnInnerEl,
+ btnIconEl = owner.btnIconEl,
+ sizeIconEl = (owner.icon || owner.iconCls) && (owner.iconAlign == "top" || owner.iconAlign == "bottom"),
minWidth = owner.minWidth,
maxWidth = owner.maxWidth,
ownerWidth, btnFrameWidth, metrics;
@@ -65,17 +67,22 @@ Ext.define('Ext.layout.component.Button', {
// In IE7 strict mode button elements with width:auto get strange extra side margins within
// the wrapping table cell, but they go away if the width is explicitly set. So we measure
// the size of the text and set the width to match.
- if (owner.text && Ext.isIE7 && Ext.isStrict && btnEl && btnEl.getWidth() > 20) {
+ if (owner.text && (Ext.isIE6 || Ext.isIE7) && Ext.isStrict && btnEl && btnEl.getWidth() > 20) {
btnFrameWidth = me.btnFrameWidth;
metrics = Ext.util.TextMetrics.measure(btnInnerEl, owner.text);
ownerEl.setWidth(metrics.width + btnFrameWidth + me.adjWidth);
btnEl.setWidth(metrics.width + btnFrameWidth);
btnInnerEl.setWidth(metrics.width + btnFrameWidth);
+
+ if (sizeIconEl) {
+ btnIconEl.setWidth(metrics.width + btnFrameWidth);
+ }
} else {
// Remove any previous fixed widths
ownerEl.setWidth(null);
btnEl.setWidth(null);
btnInnerEl.setWidth(null);
+ btnIconEl.setWidth(null);
}
// Handle maxWidth/minWidth config
@@ -108,7 +115,7 @@ Ext.define('Ext.layout.component.Button', {
me.callParent(arguments);
me.setElementSize(owner.btnEl, btnWidth, btnHeight);
me.setElementSize(btnInnerEl, btnWidth, btnHeight);
- if (isNum(btnHeight)) {
+ if (btnHeight >= 0) {
btnInnerEl.setStyle('line-height', btnHeight - btnFrameHeight + 'px');
}