From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 27 Feb 2008 06:47:30 +0000 (+0000)
Subject: fixes #1225
X-Git-Tag: 6.7.0.beta1~5010
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=44bd75c1ff84f67816a5d8f7d637fc3b94fc8d5b;p=vaadin-framework.git

fixes #1225

svn changeset:3933/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
index e17271bf33..50a152ada0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
@@ -4,7 +4,9 @@
 
 package com.itmill.toolkit.terminal.gwt.client.ui;
 
+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.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
@@ -94,7 +96,17 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
 
         DOM.setStyleAttribute(firstContainer, "overflow", "auto");
         DOM.setStyleAttribute(secondContainer, "overflow", "auto");
-
+        if (Util.isIE7()) {
+            /*
+             * Part I of IE7 weirdness hack, will be set to auto in layout phase
+             * 
+             * With IE7 one will sometimes get scrollbars with overflow auto
+             * even though there is nothing to scroll (content fits into area).
+             * 
+             */
+            DOM.setStyleAttribute(firstContainer, "overflow", "hidden");
+            DOM.setStyleAttribute(secondContainer, "overflow", "hidden");
+        }
     }
 
     private void setOrientation(int orientation) {
@@ -148,6 +160,15 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
         }
         newFirstChild.updateFromUIDL(uidl.getChildUIDL(0), client);
         newSecondChild.updateFromUIDL(uidl.getChildUIDL(1), client);
+
+        if (Util.isIE7()) {
+            // Part III of IE7 hack
+            DeferredCommand.addCommand(new Command() {
+                public void execute() {
+                    iLayout();
+                }
+            });
+        }
     }
 
     private void setSplitPosition(String pos) {
@@ -225,14 +246,26 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                     secondContainerHeight + "px");
             DOM.setStyleAttribute(secondContainer, "top",
                     (pixelPosition + getSplitterSize()) + "px");
+            ApplicationConnection.getConsole().log(
+                    "secondContainerHeight:" + secondContainerHeight);
             break;
-        default:
-            ApplicationConnection.getConsole().log("???");
+        }
 
-            break;
+        if (Util.isIE7()) {
+            // Part I of IE7 weirdness hack, will be set to auto in layout phase
+            DOM.setStyleAttribute(firstContainer, "overflow", "hidden");
+            DOM.setStyleAttribute(secondContainer, "overflow", "hidden");
+            Util.runDescendentsLayout(this);
+            DeferredCommand.addCommand(new Command() {
+                public void execute() {
+                    DOM.setStyleAttribute(firstContainer, "overflow", "auto");
+                    DOM.setStyleAttribute(secondContainer, "overflow", "auto");
+                }
+            });
+        } else {
+            Util.runDescendentsLayout(this);
         }
 
-        Util.runDescendentsLayout(this);
     }
 
     private void setFirstWidget(Widget w) {