Fixed horizontalPaddingAndBorder measurement for IE6. Vertical version could use...

Added a classname to VWindow: v-window-footer-no-resize. This is needed by IE7, that fails to render floated resizebox inside the footer properly.

svn changeset:7986/svn branch:6.0

diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java
index 99e9e8cce1d6484f2169ce369c12ff6e97b81c64..a1e542ed448e435eb42a24e1f4a85b08f8d11fd2 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/Util.java
+++ b/src/com/vaadin/terminal/gwt/client/Util.java
@@ -257,6 +257,11 @@ public class Util {
     public static int measureHorizontalPaddingAndBorder(Element element,
             int paddingGuess) {
         String originalWidth = DOM.getStyleAttribute(element, "width");
+        String originalOverflow = "";
+        if (BrowserInfo.get().isIE6()) {
+            originalOverflow = DOM.getStyleAttribute(element, "overflow");
+            DOM.setStyleAttribute(element, "overflow", "hidden");
+        }
         int originalOffsetWidth = element.getOffsetWidth();
         int widthGuess = (originalOffsetWidth - paddingGuess);
         if (widthGuess < 1) {
@@ -266,6 +271,9 @@ public class Util {
         int padding = element.getOffsetWidth() - widthGuess;
 
         DOM.setStyleAttribute(element, "width", originalWidth);
+        if (BrowserInfo.get().isIE6()) {
+            DOM.setStyleAttribute(element, "overflow", originalOverflow);
+        }
         return padding;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 787fe6e939f85c6195194781950ed082403d54d5..5e30585dbcb3bbc032782efecdbe5f8dd917ed9d 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -614,9 +614,12 @@ public class VWindow extends VOverlay implements Container, ScrollListener {
     private void setResizable(boolean resizability) {
         resizable = resizability;
         if (resizability) {
+            DOM.setElementProperty(footer, "className", CLASSNAME + "-footer");
             DOM.setElementProperty(resizeBox, "className", CLASSNAME
                     + "-resizebox");
         } else {
+            DOM.setElementProperty(footer, "className", CLASSNAME + "-footer "
+                    + CLASSNAME + "-footer-noresize");
             DOM.setElementProperty(resizeBox, "className", CLASSNAME
                     + "-resizebox " + CLASSNAME + "-resizebox-disabled");
         }