Fixed stretching button IE7 issue in IButton instead of using css expression. Should...

svn changeset:6277/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/button/button.css b/WebContent/ITMILL/themes/default/button/button.css
index 0d872cf8860beda292c16329fd1e0c95b99f66c7..d471d699cbf6ef4d425f8178bff7c40ee333ec90 100644 (file)
--- a/WebContent/ITMILL/themes/default/button/button.css
+++ b/WebContent/ITMILL/themes/default/button/button.css
@@ -43,15 +43,8 @@
        overflow: visible;
        padding-left: 10px;
        padding-right: 10px;
-       width: expression(this.offsetWidth + "px");
 }\r
 \r
-/* can't use expression hack in IE7 if lot's of button due \r
- * performance issues (as often in table). See #2329 */\r
-*+html .i-table .i-button {\r
-       width: auto;\r
-}\r
-       
 /* Error indicator on checkbox fix for IE6 */
 * html .i-checkbox * { display: block; float: left;}
 * html .i-checkbox .i-errorindicator {padding-right:4px;}

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 04a47d06cc75b5402f3d247acf6b58ab4de5877a..d99a2e6b9d818aa23b6447861b1a7c45dbdf78e1 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -93,15 +93,8 @@
        overflow: visible;
        padding-left: 10px;
        padding-right: 10px;
-       width: expression(this.offsetWidth + "px");
 }
 
-/* can't use expression hack in IE7 if lot's of button due 
- * performance issues (as often in table). See #2329 */
-*+html .i-table .i-button {
-       width: auto;
-}
-       
 /* Error indicator on checkbox fix for IE6 */
 * html .i-checkbox * { display: block; float: left;}
 * html .i-checkbox .i-errorindicator {padding-right:4px;}

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
index 80d5078e6f0d84108e73b0603c62d0b97db70df8..160bcace2f665764d9a6c22d11b90153fd043b04 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
@@ -114,6 +114,11 @@ public class IButton extends Button implements Paintable {
                 icon = null;
             }
         }
+        if (BrowserInfo.get().isIE7()) {
+            if (width.equals("")) {
+                setWidth(getOffsetWidth() + "px");
+            }
+        }
     }
 
     @Override