From: John Alhroos <john.ahlroos@itmill.com>
Date: Mon, 26 Apr 2010 14:52:30 +0000 (+0000)
Subject: Fixed IE6&7 Footer cell width and height problem.
X-Git-Tag: 6.7.0.beta1~1703
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=01ab62228befd8e3dc6a766b042d0fd1c33f239c;p=vaadin-framework.git

Fixed IE6&7 Footer cell width and height problem.

svn changeset:12848/svn branch:6.4
---

diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index 45e55c3da9..becffeaa8b 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -58,10 +58,9 @@
 	border-top: none;
 	background: #efefef;
 }
-.v-table-footer table,
-.v-table-table {
+.v-table-footer table{
 	border-spacing: 0;
-	border-collapse: separate;
+	border-collapse: collapse;
 	margin: 0;
 	padding: 0;
 	border: 0;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index fbd762027b..b04e5f998d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2041,14 +2041,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 /*
                  * Reduce width with one pixel for the right border since the
                  * footers does not have any spacers between them.
-                 * 
-                 * IE6 will calculate the footer width wrong by 2 pixels due to
-                 * borders used so add it to border widths.
                  */
                 int borderWidths = 1;
-                if (BrowserInfo.get().isIE6()) {
-                    borderWidths += 2;
-                }
 
                 // Set the container width (check for negative value)
                 if (w - borderWidths >= 0) {
@@ -2074,12 +2068,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 } else {
                     DeferredCommand.addCommand(new Command() {
                         public void execute() {
-
                             int borderWidths = 1;
-                            if (BrowserInfo.get().isIE6()) {
-                                borderWidths += 2;
-                            }
-
                             int tdWidth = width
                                     + scrollBody.getCellExtraWidth()
                                     - borderWidths;