From: Artur Signell <artur@vaadin.com>
Date: Mon, 4 Nov 2013 09:26:54 +0000 (+0200)
Subject: Reverted change in how hack works (#12727, #12736)
X-Git-Tag: 7.1.8~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c48c94dc23da22b6d885c69b0bc697257f9dbf11;p=vaadin-framework.git

Reverted change in how hack works (#12727, #12736)

The fix for Window slightly altered how the hack was done, breaking #12736

Change-Id: I2d33b45421c40ce011d2e728a573f7572e326c47
---

diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index 8a5712215d..206aa83c2b 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -556,10 +556,10 @@ public class Util {
                     final String oldHeight = scrollable.getStyle().getHeight();
 
                     scrollable.getStyle().setWidth(110, Unit.PCT);
-                    scrollable.getStyle().setHeight(110, Unit.PCT);
                     scrollable.getOffsetWidth();
-                    scrollable.getOffsetHeight();
                     scrollable.getStyle().setProperty("width", oldWidth);
+                    scrollable.getStyle().setHeight(110, Unit.PCT);
+                    scrollable.getOffsetHeight();
                     scrollable.getStyle().setProperty("height", oldHeight);
 
                     // Restore the scroll position