Changeset 5091

Timestamp:

07/11/08 11:57:33 (4 months ago)

Author:

matti.tahvonen@…

Message:

workaround for #1869 + updated deprecated methods

Files:

• trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java (modified) (6 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java

@@ -9 +9 @@
 import java.util.Iterator;
 
+import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ComplexPanel;
@@ -16 +18 @@
 import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
 import com.itmill.toolkit.terminal.gwt.client.Caption;
 import com.itmill.toolkit.terminal.gwt.client.Container;
@@ -94 +97 @@
         if (orientationMode == ORIENTATION_HORIZONTAL) {
             marginElement = DOM.createDiv();
-            if (Util.isIE()) {
+            if (BrowserInfo.get().isIE()) {
                 DOM.setStyleAttribute(marginElement, "zoom", "1");
                 DOM.setStyleAttribute(marginElement, "overflow", "hidden");
             }
             childContainer = DOM.createDiv();
-            if (Util.isIE()) {
+            if (BrowserInfo.get().isIE()) {
                 DOM.setStyleAttribute(childContainer, "zoom", "1");
                 DOM.setStyleAttribute(childContainer, "overflow", "hidden");
@@ -213 +216 @@
             setElement(DOM.createDiv());
             DOM.setStyleAttribute(getElement(), "cssFloat", "left");
-            if (Util.isIE()) {
+            if (BrowserInfo.get().isIE()) {
                 DOM.setStyleAttribute(getElement(), "styleFloat", "left");
             }
@@ -473 +476 @@
         int size;
         if (orientationMode == ORIENTATION_VERTICAL) {
-            if (Util.isIE6()) {
+            if (BrowserInfo.get().isIE6()) {
                 DOM.setStyleAttribute(getElement(), "overflow", "hidden");
             }
             size = getOffsetHeight();
-            if (Util.isIE6()) {
+            if (BrowserInfo.get().isIE6()) {
                 DOM.setStyleAttribute(getElement(), "overflow", "visible");
             }
@@ -710 +713 @@
                     client);
         }
+
+        // workaround for safari bug #1869
+        float wkv = BrowserInfo.get().getWebkitVersion();
+        if (wkv > 0 && wkv < 526.9) {
+            DeferredCommand.addCommand(new Command() {
+                public void execute() {
+                    iLayout();
+                }
+            });
+        }
     }
 }