From 55ccd1c9d5ccd2c7dda928da3b1ad453c3c4c82f Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 11 Apr 2011 11:57:04 +0000 Subject: [PATCH] #6807 Applied IE6/IE8 fix to IE9 aswell svn changeset:18205/svn branch:6.6 --- src/com/vaadin/terminal/gwt/client/Util.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index ec30a25d40..e6819efc44 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -348,14 +348,14 @@ public class Util { public static int measureHorizontalBorder(Element element) { int borders; - // element.getClientWidth(); + if (BrowserInfo.get().isIE()) { String width = element.getStyle().getProperty("width"); String height = element.getStyle().getProperty("height"); int offsetWidth = element.getOffsetWidth(); int offsetHeight = element.getOffsetHeight(); - if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE8()) { + if (!BrowserInfo.get().isIE7()) { if (offsetHeight < 1) { offsetHeight = 1; } @@ -369,7 +369,7 @@ public class Util { borders = element.getOffsetWidth() - element.getClientWidth(); element.getStyle().setProperty("width", width); - if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE8()) { + if (!BrowserInfo.get().isIE7()) { element.getStyle().setProperty("height", height); } } else { -- 2.39.5