From: Marko Grönroos <magi@iki.fi>
Date: Mon, 8 Dec 2008 09:56:56 +0000 (+0000)
Subject: Do not assert detected scroll bar size, because it causes problems in current Linux... 
X-Git-Tag: 6.7.0.beta1~3646
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8807aac3847fa76f1e104bf74a080f3659b0e12a;p=vaadin-framework.git

Do not assert detected scroll bar size, because it causes problems in current Linux Hosted Mode Browser. Fixes #2299.

svn changeset:6112/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Util.java b/src/com/itmill/toolkit/terminal/gwt/client/Util.java
index 85df1f2759..c08648089c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Util.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Util.java
@@ -428,7 +428,13 @@ public class Util {
             RootPanel.getBodyElement().appendChild(scroller);
             detectedScrollbarSize = scroller.getOffsetWidth()
                     - scroller.getPropertyInt("clientWidth");
-            assert detectedScrollbarSize != 0;
+	   
+            // Asserting the detected value causes a problem
+	    // at least in Hosted Mode Browser/Linux/GWT-1.5.3, so
+	    // use a default if detection fails.
+	    if (detectedScrollbarSize == 0)
+	        detectedScrollbarSize = 20;
+	   
             RootPanel.getBodyElement().removeChild(scroller);
 
         }