Changeset 688910a2 in vaadin

Timestamp:

03/23/12 08:35:19 (14 months ago)

Author:

Leif Åstrand <leif@…>

Branches:

20b169873dbacf9eb7135a861bc5cf15177225ee, 34e6c60a5a746c0306c3a84ae8d6c21dfd84d878, 2772641acf8f84046e3ac42c8386b65e4f2346f2

Children:

144072f8

Parents:

14b4b323

git-author:

Leif Åstrand <leif@…> (03/23/12 08:35:11)

git-committer:

Leif Åstrand <leif@…> (03/23/12 08:35:19)

Message:

Force more reflows in IE8 to detect icon style (#8313)

File:

• src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java (modified) (2 diffs)

src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java

@@ -1151 +1151 @@
             if (selectedItemIcon.isAttached()) {
                 panel.remove(selectedItemIcon);
+                if (BrowserInfo.get().isIE8()) {
+                    forceReflow();
+                }
                 updateRootWidth();
             }
         } else {
+            selectedItemIcon.setUrl(iconUri);
             panel.insert(selectedItemIcon, 0);
-            selectedItemIcon.setUrl(iconUri);
+            if (BrowserInfo.get().isIE8()) {
+                forceReflow();
+            }
             updateRootWidth();
             updateSelectedIconPosition();
         }
+    }
+
+    private void forceReflow() {
+        Style style = tb.getElement().getStyle();
+
+        String oldZoom = style.getProperty("zoom");
+        style.setProperty("zoom", "1");
+
+        // Forces reflow because style has changed
+        tb.getOffsetWidth();
+
+        // Restore old style
+        style.setProperty("zoom", oldZoom);
     }
 
@@ -1606 +1625 @@
              * locked
              */
-            Style style = tb.getElement().getStyle();
-            if (!style.getWidth().endsWith("px")) {
-                boolean isIE8 = BrowserInfo.get().isIE8();
-                if (isIE8) {
-                    // Must do something to make IE8 realize that it should
-                    // reflow the component when the offset width is read
-                    style.setProperty("zoom", "1");
-                }
+            if (!tb.getElement().getStyle().getWidth().endsWith("px")) {
                 tb.setWidth((tb.getOffsetWidth() - selectedItemIcon
                         .getOffsetWidth()) + "px");
-                if (isIE8) {
-                    // Restore old style property value
-                    style.clearProperty("zoom");
-                }
             }
         }