Fix bug that setting focus on invisible element in IE will trigger an exception.

zhourenjian · zhourenjian · commit de9be48aea5e · 2009-03-08T16:22:36.000Z
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
@@ -908,8 +908,14 @@ public static Point getImageSize(Image image) {
 		return new Point(w, h); 
 	}
 	
+	/**
+	 * @j2sNative
+	 * try {
+	 * handle.focus();
+	 * } catch (e) {}
+	 */
 	public static void SetFocus(Element handle) {
-		handle.focus();
+		// handle.focus();
 	}
 	
 
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
@@ -835,13 +835,16 @@ public void setAlignment (int alignment) {
 		if ((style & SWT.LEFT) != 0) {
 			btnText.style.textAlign = "left";
 			handleStyle.backgroundPosition = "left center";
-		} if ((style & SWT.CENTER) != 0) {
+		} else if ((style & SWT.CENTER) != 0) {
 			btnText.style.textAlign = "center";
 			handleStyle.backgroundPosition = "center center";
 		} else if ((style & SWT.RIGHT) != 0) {
 			btnText.style.textAlign = "right";
 			handleStyle.backgroundPosition = "right center";
 		}
+		if (text != null && text.trim().length() != 0) {
+			handleStyle.backgroundPosition = "left center";
+		}
 	}
 	/*
 	int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
@@ -879,9 +882,7 @@ void setDefault (boolean value) {
 	OS.SendMessage (handle, OS.BM_SETSTYLE, bits, 1);
 	*/
 	if (value) {
-		try {
-			handle.focus();
-		} catch (Error e) { }
+		OS.SetFocus(handle); // handle.focus();
 	}
 }
 
@@ -1048,6 +1049,9 @@ public void setImage (Image image) {
 					bgXPos = "right";
 				} else if ((style & SWT.CENTER) != 0) {
 					bgXPos = "center";
+					if (text != null && text.trim().length() != 0) {
+						bgXPos = "left";
+					}
 				} else {
 					bgXPos = "left";
 				}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ColorDialog.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ColorDialog.java
@@ -546,7 +546,7 @@ public void run() {
 			OS.addCSSClass(containerHandle.childNodes[0], "color-dialog-custom");
 //			parent.display.asyncExec(new Runnable() {
 //				public void run() {
-//					hText.focus();
+//					OS.SetFocus(hText); //hText.focus();
 //				}
 //			});
 		}
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
@@ -728,7 +728,8 @@ void hide(){
 		
 	}
 	selectInput.className = "combo-select-box-invisible" + (isSimple ? "" : " combo-select-box-notsimple");
-	dropDownButton.focus();
+	//dropDownButton.focus();
+	OS.SetFocus(dropDownButton);
 }
 
 void show(){
@@ -783,11 +784,7 @@ void show(){
 		selectInput.style.height = bounds.height + "px";
 	}
 	selectInput.style.width = bounds.width +"px";
-	try {
-		selectInput.focus();
-	} catch (Throwable e) {
-		// TODO: handle exception
-	}
+	OS.SetFocus(selectInput); // selectInput.focus();
 }
 
 void updateSelection(){
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java
@@ -746,7 +746,7 @@ public boolean updateShellBounds(int x, int y, int w, int h) {
 	}
 //	contentHandle.onclick = new RunnableCompatibility(){
 //		public void run(){
-//			contentHandle.focus();
+//			OS.SetFocus(contentHandle); //contentHandle.focus();
 //		}
 //	};
 	contentHandle.onkeydown = new RunnableCompatibility() {
@@ -2263,7 +2263,7 @@ public void run() {
 		public void run() {
 			bringToTop();
 			if(contentHandle != null){
-				contentHandle.focus();
+				OS.SetFocus(contentHandle); //contentHandle.focus();
 			}
 			toReturn(true);
 		}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java
@@ -262,9 +262,7 @@ void _setVisible (boolean visible) {
 		}
 		style.left = left + "px";
 		style.top = top + "px";
-		try {
-			btnFocus.focus();
-		} catch (Error err) {}
+		OS.SetFocus(btnFocus); //btnFocus.focus();
 		if (hooks(SWT.Show)) sendEvent(SWT.Show);
 	} else {
 		style.display = "none";
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MenuItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MenuItem.java
@@ -303,9 +303,7 @@ public void run() {
 			if (!isEnabled()) {
 				display.timerExec(40, new Runnable() {
 					public void run() {
-						try {
-							parent.btnFocus.focus();
-						} catch (Error e) { }
+						OS.SetFocus(parent.btnFocus); //parent.btnFocus.focus();
 					}
 				});
 				return;
@@ -1388,9 +1386,7 @@ void showSubMenu() {
 	menu.handle.style.top = rect.y + "px";
 	menu.handle.style.zIndex = "1" + window.currentTopZIndex;
 	menu.handle.style.display = "block";
-	try {
-		menu.btnFocus.focus();
-	} catch (Error err) {}
+	OS.SetFocus(menu.btnFocus); // menu.btnFocus.focus();
 }
 
 /*
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TableItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TableItem.java
@@ -167,7 +167,7 @@ public void run() {
 				return;
 			}
 //			handle.focus();
-			parent.handle.focus();
+			OS.SetFocus(parent.handle); //parent.handle.focus();
 //			Element element = handle.childNodes[0].childNodes[0].childNodes[1];
 //			element.className = "tree-item-text-selected";
 			HTMLEvent evt = (HTMLEvent) getEvent();
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Text.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Text.java
@@ -240,7 +240,7 @@ void createHandle () {
 	}
 	handle.onfocus = new RunnableCompatibility() {
 		public void run() {
-			textHandle.focus();
+			OS.SetFocus(textHandle); //textHandle.focus();
 		}
 	};
 	Element wrapper = document.createElement("DIV");
@@ -2860,15 +2860,8 @@ void enableWidget (boolean enabled) {
 
 public boolean forceFocus() {
 	boolean ret = super.forceFocus();
-	//this.textHandle.focus();
-	/**
-	 * @j2sNative
-	 * try {
-	 * 	this.textHandle.focus();
-	 * } catch (e) {}
-	 */ {}
+	OS.SetFocus(textHandle); //this.textHandle.focus();
 	return ret;
 }
 
-
 }

Original file line number	Diff line number	Diff line change
`@@ -908,8 +908,14 @@ public static Point getImageSize(Image image) {`
`908`	`908`	`return new Point(w, h);`
`909`	`909`	`}`
`910`	`910`
	`911`	`+ /**`
	`912`	`+ * @j2sNative`
	`913`	`+ * try {`
	`914`	`+ * handle.focus();`
	`915`	`+ * } catch (e) {}`
	`916`	`+ */`
`911`	`917`	`public static void SetFocus(Element handle) {`
`912`		`- handle.focus();`
	`918`	`+ // handle.focus();`
`913`	`919`	`}`
`914`	`920`
`915`	`921`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ public void run() {`
`546`	`546`	`OS.addCSSClass(containerHandle.childNodes[0], "color-dialog-custom");`
`547`	`547`	`// parent.display.asyncExec(new Runnable() {`
`548`	`548`	`// public void run() {`
`549`		`-// hText.focus();`
	`549`	`+// OS.SetFocus(hText); //hText.focus();`
`550`	`550`	`// }`
`551`	`551`	`// });`
`552`	`552`	`}`
Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,8 @@ void hide(){`
`728`	`728`
`729`	`729`	`}`
`730`	`730`	`selectInput.className = "combo-select-box-invisible" + (isSimple ? "" : " combo-select-box-notsimple");`
`731`		`- dropDownButton.focus();`
	`731`	`+ //dropDownButton.focus();`
	`732`	`+ OS.SetFocus(dropDownButton);`
`732`	`733`	`}`
`733`	`734`
`734`	`735`	`void show(){`
`@@ -783,11 +784,7 @@ void show(){`
`783`	`784`	`selectInput.style.height = bounds.height + "px";`
`784`	`785`	`}`
`785`	`786`	`selectInput.style.width = bounds.width +"px";`
`786`		`- try {`
`787`		`- selectInput.focus();`
`788`		`- } catch (Throwable e) {`
`789`		`- // TODO: handle exception`
`790`		`- }`
	`787`	`+ OS.SetFocus(selectInput); // selectInput.focus();`
`791`	`788`	`}`
`792`	`789`
`793`	`790`	`void updateSelection(){`
Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ public boolean updateShellBounds(int x, int y, int w, int h) {`
`746`	`746`	`}`
`747`	`747`	`// contentHandle.onclick = new RunnableCompatibility(){`
`748`	`748`	`// public void run(){`
`749`		`-// contentHandle.focus();`
	`749`	`+// OS.SetFocus(contentHandle); //contentHandle.focus();`
`750`	`750`	`// }`
`751`	`751`	`// };`
`752`	`752`	`contentHandle.onkeydown = new RunnableCompatibility() {`
`@@ -2263,7 +2263,7 @@ public void run() {`
`2263`	`2263`	`public void run() {`
`2264`	`2264`	`bringToTop();`
`2265`	`2265`	`if(contentHandle != null){`
`2266`		`- contentHandle.focus();`
	`2266`	`+ OS.SetFocus(contentHandle); //contentHandle.focus();`
`2267`	`2267`	`}`
`2268`	`2268`	`toReturn(true);`
`2269`	`2269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public void run() {`
`167`	`167`	`return;`
`168`	`168`	`}`
`169`	`169`	`// handle.focus();`
`170`		`- parent.handle.focus();`
	`170`	`+ OS.SetFocus(parent.handle); //parent.handle.focus();`
`171`	`171`	`// Element element = handle.childNodes[0].childNodes[0].childNodes[1];`
`172`	`172`	`// element.className = "tree-item-text-selected";`
`173`	`173`	`HTMLEvent evt = (HTMLEvent) getEvent();`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ void createHandle () {`
`240`	`240`	`}`
`241`	`241`	`handle.onfocus = new RunnableCompatibility() {`
`242`	`242`	`public void run() {`
`243`		`- textHandle.focus();`
	`243`	`+ OS.SetFocus(textHandle); //textHandle.focus();`
`244`	`244`	`}`
`245`	`245`	`};`
`246`	`246`	`Element wrapper = document.createElement("DIV");`
`@@ -2860,15 +2860,8 @@ void enableWidget (boolean enabled) {`
`2860`	`2860`
`2861`	`2861`	`public boolean forceFocus() {`
`2862`	`2862`	`boolean ret = super.forceFocus();`
`2863`		`- //this.textHandle.focus();`
`2864`		`- /**`
`2865`		`- * @j2sNative`
`2866`		`- * try {`
`2867`		`- * this.textHandle.focus();`
`2868`		`- * } catch (e) {}`
`2869`		`- */ {}`
	`2863`	`+ OS.SetFocus(textHandle); //this.textHandle.focus();`
`2870`	`2864`	`return ret;`
`2871`	`2865`	`}`
`2872`	`2866`
`2873`		`-`
`2874`	`2867`	`}`