java2script
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java‎
Lines changed: 14 additions & 0 deletions b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/dnd/ShellFrameDND.java‎
Lines changed: 2 additions & 1 deletion b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/dnd/ShellFrameDND.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java‎
Lines changed: 2 additions & 2 deletions b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java‎
Lines changed: 2 additions & 2 deletions
@@ -675,4 +675,18 @@ public static void updateCSSClass(Object el, String cssClazz, boolean kept) {
 			 */ {}
 		}
 	}
+	
+	public static int fixBodyClientHeight() {
+	    Element b = document.body;
+	    Element p = b.parentNode;
+	    int bcHeight = b.clientHeight;
+	    int pcHeight = p.clientHeight;
+	    if (OS.isIE) { // && !OS.isOpera
+	        return (pcHeight == 0) ? bcHeight : pcHeight;
+	    } else if (OS.isFirefox) {
+	        return (pcHeight == p.offsetHeight 
+	                && pcHeight == p.scrollHeight) ? bcHeight : pcHeight;
+	    }
+	    return bcHeight;
+	}
 }
@@ -13,6 +13,7 @@
 
 package org.eclipse.swt.internal.dnd;
 
+import org.eclipse.swt.internal.browser.OS;
 import org.eclipse.swt.internal.xhtml.Element;
 import org.eclipse.swt.internal.xhtml.HTMLEvent;
 import org.eclipse.swt.internal.xhtml.document;
@@ -162,7 +163,7 @@ public boolean dragging(DragEvent e) {
 		int xx = this.sourceX + e.deltaX ();
 		int yy = this.sourceY + e.deltaY ();
 
-		int gHeight = document.body.clientHeight;
+		int gHeight = OS.fixBodyClientHeight(); //document.body.clientHeight;
 		int gWidth = document.body.clientWidth;
 		/*
 		 * On mozilla, the mousemove event can contain mousemove
 
@@ -2256,7 +2256,7 @@ public void _updateMonitorSize() {
 	Element el = monitor.handle;
 	if (el == document.body) {
 		monitor.clientWidth = document.body.clientWidth; 
-		monitor.clientHeight = document.body.clientHeight;
+		monitor.clientHeight = OS.fixBodyClientHeight(); //document.body.clientHeight;
 		monitor.x = 0;
 		monitor.y = 0;
 		monitor.width = window.screen.availWidth;
 
@@ -1725,7 +1725,7 @@ Shell getModalDialogShell () {
 		monitor.handle = document.body;
 		monitor.clientWidth = document.body.clientWidth; 
 		monitor.width = window.screen.availWidth;
-		monitor.clientHeight = document.body.clientHeight;
+		monitor.clientHeight = OS.fixBodyClientHeight(); //document.body.clientHeight;
 		monitor.height = window.screen.availHeight;
 		monitor.clientX = monitor.x = 0;
 		monitor.clientY = monitor.y = 0;
@@ -1752,7 +1752,7 @@ protected static void registerElementAsMonitor(Element el) {
 		monitor.handle = document.body;
 		monitor.clientWidth = document.body.clientWidth; 
 		monitor.width = window.screen.availWidth;
-		monitor.clientHeight = document.body.clientHeight;
+		monitor.clientHeight = OS.fixBodyClientHeight(); //document.body.clientHeight;
 		monitor.height = window.screen.availHeight;
 		monitor.clientX = monitor.x = 0;
 		monitor.clientY = monitor.y = 0;
Original file line number	Diff line number	Diff line change
`@@ -675,4 +675,18 @@ public static void updateCSSClass(Object el, String cssClazz, boolean kept) {`
`675`	`675`	`*/ {}`
`676`	`676`	`}`
`677`	`677`	`}`
	`678`	`+`
	`679`	`+ public static int fixBodyClientHeight() {`
	`680`	`+ Element b = document.body;`
	`681`	`+ Element p = b.parentNode;`
	`682`	`+ int bcHeight = b.clientHeight;`
	`683`	`+ int pcHeight = p.clientHeight;`
	`684`	`+ if (OS.isIE) { // && !OS.isOpera`
	`685`	`+ return (pcHeight == 0) ? bcHeight : pcHeight;`
	`686`	`+ } else if (OS.isFirefox) {`
	`687`	`+ return (pcHeight == p.offsetHeight`
	`688`	`+ && pcHeight == p.scrollHeight) ? bcHeight : pcHeight;`
	`689`	`+ }`
	`690`	`+ return bcHeight;`
	`691`	`+ }`
`678`	`692`	`}`