Optimize for mobile web browsers

zhourenjian · zhourenjian · commit c45b6f94a65e · 2016-05-17T14:11:14.000+08:00
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/ResizeHandler.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/ResizeHandler.java
@@ -38,7 +38,7 @@ public ResizeHandler(Decorations shell, int status) {
 		this.status = status;
 	}
 	
-	private Rectangle getClientArea() {
+	public Rectangle getClientArea() {
 		int orientation = SWT.LEFT;
 		int clientWidth = 0;
 		int clientHeight = 0;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/ResizeSystem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/ResizeSystem.java
@@ -20,6 +20,7 @@
  * @author zhou renjian
  *
  * 2006-4-24
+ * @j2sRequireImport org.eclipse.swt.internal.browser.OS
  * @j2sSuffix
 var $browserResizingHandle = null;
 $browserLayoutResize = function () {
@@ -33,6 +34,9 @@
 
 if (document.addEventListener) {
 	window.addEventListener('resize', $browserLayoutResize, true);
+	if (O$.isMobile) {
+		window.addEventListener('orientationchange', $browserLayoutResize, true);
+	}
 } else if (document.attachEvent) {
 	window.attachEvent('onresize', $browserLayoutResize);
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java
@@ -18,6 +18,7 @@
 import org.eclipse.swt.internal.xhtml.CSSStyle;
 import org.eclipse.swt.internal.xhtml.Element;
 import org.eclipse.swt.internal.xhtml.document;
+import org.eclipse.swt.internal.xhtml.window;
 
 /**
  * @author zhou renjian
@@ -64,6 +65,11 @@ private OS() {
 	
 	public static boolean isChrome30 = false;
 	
+	public static boolean isMobile = false;
+	
+	public static boolean isAndroid = false;
+	
+	public static boolean isiOS = false;
 	
 	/* Record Caps Lock status */
 	public static boolean isCapsLockOn = false;
@@ -103,6 +109,31 @@ private OS() {
 	os.isIE90 = os.isIE && dua.indexOf("MSIE 9.0")>=0;
 	os.isIENeedPNGFix = os.isIE50 || os.isIE55 || os.isIE60;
 	os.noReturnCallback = os.noReturnCallbackFunction;
+	if (dua.match(/Android/i)
+			|| dua.match(/webOS/i)
+			|| dua.match(/iPhone/i)
+			|| dua.match(/iPad/i)
+			|| dua.match(/iPod/i)
+			|| dua.match(/BlackBerry/i)
+			|| dua.match(/Windows Phone/i)
+		) {
+		os.isMobile = true;
+	} else {
+		os.isMobile = false;
+	}
+	if (dua.match(/Android/i)) {
+		os.isAndroid = true;
+	} else {
+		os.isAndroid = false;
+	}
+	if (dua.match(/iPhone/i)
+			|| dua.match(/iPad/i)
+			|| dua.match(/iPod/i)
+		) {
+		os.isiOS = true;
+	} else {
+		os.isiOS = false;
+	}
 	 */
 	static {
 		
@@ -938,7 +969,11 @@ public static int getFixedBodyClientHeight() {
 	    Element p = b.parentNode;
 	    int bcHeight = b.clientHeight;
 	    int pcHeight = p.clientHeight;
-	    if (OS.isIE) { // && !OS.isOpera
+	    if (OS.isMobile) {
+	    	int height = (pcHeight == p.offsetHeight 
+	                && pcHeight == p.scrollHeight) ? bcHeight : pcHeight;
+	    	return Math.max(window.innerHeight, height);
+	    } else if (OS.isIE) { // && !OS.isOpera
 	        return (pcHeight == 0) ? bcHeight : pcHeight;
 	    } else if (OS.isFirefox || OS.isSafari) {
 	        return (pcHeight == p.offsetHeight 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/window.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/window.java
@@ -10,6 +10,9 @@ public class window {
 	public static int clientWidth;
 	public static int clientHeight;
 	
+	public static int innerWidth; // IE9+
+	public static int innerHeight; // IE9+
+	
 	public static Screen screen;
 	public static History history;
 	
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java
@@ -505,7 +505,7 @@ void createHandle() {
 		if (OS.isChrome) {
 			btnHandle.className += " " + btnHandle.className + "-chrome"; 
 		} else if (OS.isSafari) {
-			boolean isSafari4Plus = false;
+			boolean isSafari4Plus = true;
 			/**
 			 * @j2sNative
 			 * var ua = navigator.userAgent;
@@ -514,7 +514,7 @@ void createHandle() {
 			 * 	var verStr = ua.substring (verIdx + 8);
 			 * 	var verNumber = parseFloat (verStr);
 			 * 	isSafari4Plus = verNumber >= 4.0
-			 * }
+			 * } // Google Chrome browser on iOS or Android does not have version number
 			 */ {}
 			if (!isSafari4Plus) { // There is no need of CSS hack for Safari 4.0+
 				btnHandle.className += " " + btnHandle.className + "-safari"; 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public ResizeHandler(Decorations shell, int status) {`
`38`	`38`	`this.status = status;`
`39`	`39`	`}`
`40`	`40`
`41`		`- private Rectangle getClientArea() {`
	`41`	`+ public Rectangle getClientArea() {`
`42`	`42`	`int orientation = SWT.LEFT;`
`43`	`43`	`int clientWidth = 0;`
`44`	`44`	`int clientHeight = 0;`