Fix for #2572 - ComboBox icon aligned too low in IE6

svn changeset:6845/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
index 450db45620e019744e1d0239bc4a34baa0ccc0f7..e76374cfc2f6f813838cc92bd48bfc3f65c65162 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
@@ -573,8 +573,8 @@ public class IFilterSelect extends Composite implements Paintable, Field,
             }
 
             public void onLoad(Widget sender) {
-                updateSelectedIconPosition();
                 updateRootWidth();
+                updateSelectedIconPosition();
             }
         });
 
@@ -769,20 +769,22 @@ public class IFilterSelect extends Composite implements Paintable, Field,
     private void setSelectedItemIcon(String iconUri) {
         if (iconUri == null) {
             selectedItemIcon.setVisible(false);
+            updateRootWidth();
         } else {
             selectedItemIcon.setUrl(iconUri);
             selectedItemIcon.setVisible(true);
+            updateRootWidth();
             updateSelectedIconPosition();
         }
-        updateRootWidth();
     }
 
     private void updateSelectedIconPosition() {
         // Position icon vertically to middle
         int availableHeight = getOffsetHeight();
         int iconHeight = Util.getRequiredHeight(selectedItemIcon);
+        int marginTop = (availableHeight - iconHeight) / 2;
         DOM.setStyleAttribute(selectedItemIcon.getElement(), "marginTop",
-                (availableHeight - iconHeight) / 2 + "px");
+                marginTop + "px");
     }
 
     public void onKeyDown(Widget sender, char keyCode, int modifiers) {