Support ALAA links for XHTML page.

zhourenjian · zhourenjian · commit d18f330d97bb · 2008-10-04T13:31:49.000Z
If page client height is less than the height of browser window, the monitor size is much smaller, try to expand to 100% of window height.
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
@@ -114,6 +114,6 @@ public static void updateResize() {
 			}
 		}
 		
-		Display.getDefault().updateLayout();
+		Display.updateMonitor();
 	}
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java
@@ -386,7 +386,7 @@ public class Display extends Device {
 
 	DesktopItem[] desktopItems;
 	
-	static String bodyOverflow, htmlOverflow;
+	static String bodyHeight, bodyOverflow, htmlOverflow;
 	
 	static int AUTO_HIDE_DELAY = 2000;
 	
@@ -480,6 +480,7 @@ public Display () {
  */
 public Display (DeviceData data) {
 	super (data);
+	System.out.println("hi...");
 }
 
 /*
@@ -3422,6 +3423,10 @@ protected void release () {
 			document.body.style.overflow = bodyOverflow;
 			bodyOverflow = null;
 		}
+		if (bodyHeight != null) {
+			document.body.style.height = bodyHeight;
+			bodyHeight = null;
+		}
 	}
 }
 
@@ -4569,6 +4574,20 @@ public void updateLayout() {
 	}
 }
 
+public static void updateMonitor() {
+	Display disp = Default;
+	if (disp == null || disp.isDisposed()) {
+		for (int i = 0; i < Displays.length; i++) {
+			disp = Displays[i];
+			if (disp != null && !disp.isDisposed()) {
+				break;
+			}
+		}
+	}
+	if (disp != null) {
+		disp.updateLayout();
+	}
+}
 /**
  * @j2sIgnore
  */
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.java
@@ -49,9 +49,15 @@ public void initialize() {
 		if (Display.bodyOverflow == null) {
 			Element body = document.body;
 			Display.bodyOverflow = body.style.overflow;
+			Display.bodyHeight = body.style.height;
 			Display.htmlOverflow = body.parentNode.style.overflow;
 			if (body.style.overflow != "hidden") {
 				body.style.overflow = "hidden";
+			}
+			if (body.style.height != "100%") {
+				body.style.height = "100%";
+			}
+			if (body.parentNode.style.overflow != "hidden") {
 				body.parentNode.style.overflow = "hidden";
 			}
 		}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java
@@ -357,9 +357,15 @@ public void initialize() {
 		if (Display.bodyOverflow == null) {
 			Element body = document.body;
 			Display.bodyOverflow = body.style.overflow;
+			Display.bodyHeight = body.style.height;
 			Display.htmlOverflow = body.parentNode.style.overflow;
 			if (body.style.overflow != "hidden") {
 				body.style.overflow = "hidden";
+			}
+			if (body.style.height != "100%") {
+				body.style.height = "100%";
+			}
+			if (body.parentNode.style.overflow != "hidden") {
 				body.parentNode.style.overflow = "hidden";
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,6 @@ public static void updateResize() {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- Display.getDefault().updateLayout();`
	`117`	`+ Display.updateMonitor();`
`118`	`118`	`}`
`119`	`119`	`}`