Improve Combo popup box: Adjust the popup according to the screen constrainted bounds.

jossonsmith · jossonsmith · commit 54131f19b218 · 2006-09-12T15:44:48.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/Popup.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/Popup.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Java2Script Pacemaker (http://j2s.sourceforge.net)
+ *
+ * Copyright (c) 2006 ognize.com and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     ognize.com - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.swt.internal.browser;
+
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * @author josson smith
+ *
+ * 2006-9-12
+ */
+public class Popup {
+
+	/**
+	 * Popup a given height box near the given rectangle box in the constrainted bounds.
+	 * The popup box is in the same width of give rectangle box.
+	 * 
+	 * @param bounds
+	 * @param rect
+	 * @param height
+	 * @return
+	 */
+	public static Rectangle popupList(Rectangle bounds, Rectangle rect, int height) {
+		if (height <= 0) {
+			return null;
+		}
+		int x, y, w, h = height;
+		if (bounds == null) {
+			if (rect == null) {
+				x = y = 0;
+				w = 100;
+			} else {
+				x = rect.x;
+				y = rect.y + height;
+				w = rect.width;
+			}
+		} else {
+			if (rect == null) {
+				x = bounds.x + bounds.width / 4;
+				y = bounds.y + (bounds.height - height) / 2;
+				w = bounds.width / 2;
+			} else {
+				x = rect.x;
+				w = rect.width;
+				if (rect.y + rect.height + height > bounds.y + bounds.height) {
+					if (rect.y - height >= bounds.y) {
+						y = rect.y - height;
+					} else {
+						if (bounds.height < height) {
+							y = bounds.y;
+							h = bounds.height;
+						} else {
+							if (Math.abs(bounds.y + bounds.height - height - rect.y) > Math.abs(bounds.y + height - rect.y - rect.height)) {
+								y = bounds.y;
+							} else {
+								y = bounds.y + bounds.height - height;
+							}
+						}
+					}
+				} else {
+					y = rect.y + rect.height;
+				}
+			}
+		}
+		return new Rectangle(x, y, w, h);
+	}
+	
+}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java
@@ -18,8 +18,10 @@
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.internal.RunnableCompatibility;
 import org.eclipse.swt.internal.browser.OS;
+import org.eclipse.swt.internal.browser.Popup;
 import org.eclipse.swt.internal.xhtml.Element;
 import org.eclipse.swt.internal.xhtml.HTMLEvent;
 import org.eclipse.swt.internal.xhtml.Option;
@@ -671,14 +673,27 @@ void show(){
 //	}
 
 	Point coordinate = OS.calcuateRelativePosition(handle, document.body);
-	coordinate.y += OS.getContainerHeight(handle);
+	//coordinate.y += OS.getContainerHeight(handle);
+	/*
 	if (OS.isFirefox) {
 		coordinate.x += 1;
 		coordinate.y += 1;
 	} else if (OS.isIE) {
 		coordinate.x -= 1;
 		coordinate.y -= 2;
 	}
+	*/
+	int w = OS.getContainerWidth(handle);
+	int h = OS.getContainerHeight(handle);
+	if (OS.isFirefox) {
+		coordinate.x += 1;
+		//coordinate.y -= 1;
+		h += 1;
+	} else if (OS.isIE) {
+		coordinate.x -= 1;
+		coordinate.y -= 2;
+		//h -= 2;
+	}
 	this.selectShown = true;
 	window.currentTopZIndex = "" + (Integer.parseInt(window.currentTopZIndex) + 1);
 	selectInput.style.zIndex = window.currentTopZIndex;
@@ -688,8 +703,16 @@ void show(){
 	} catch (Throwable e) {
 	}
 	selectInput.className = "combo-select-box-visible" + (isSimple ? "" : " combo-select-box-notsimple");
-	selectInput.style.top = coordinate.y + "px";
-	selectInput.style.left = coordinate.x + "px";
+	int height = OS.getContainerHeight(selectInput);
+	Rectangle bounds = Popup.popupList(getMonitor().getClientArea(), new Rectangle(coordinate.x, coordinate.y, w, h), height);
+	selectInput.style.left = bounds.x + "px";
+	selectInput.style.top = bounds.y + "px";
+	if (bounds.height != height) {
+		try {
+			selectInput.style.overflow = "overflow";
+		} catch (Throwable e) {} // IE
+		selectInput.style.height = bounds.height + "px";
+	}
 	try {
 		selectInput.focus();
 	} catch (Throwable e) {
