Fixed bug that hiding windows does not set next window active

zhourenjian · zhourenjian · commit 5d7f5001ec3d · 2009-03-15T15:54:40.000Z
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
@@ -284,7 +284,8 @@ void bringToTop (boolean parentShell, boolean childShells) {
 		Shell[] children = sh.getShells();
 		for (int i = 0; i < children.length; i++) {
 			Shell s = children[i];
-			if ((s.style & (SWT.APPLICATION_MODAL | SWT.PRIMARY_MODAL | SWT.SYSTEM_MODAL)) != 0) {
+			if ((s.style & (SWT.APPLICATION_MODAL | SWT.PRIMARY_MODAL | SWT.SYSTEM_MODAL)) != 0
+					&& s.isVisible() && !s.isDisposed()) {
 				s.bringToTop(false, true);
 			}
 		}
@@ -2263,9 +2264,11 @@ public void run() {
 	handle.appendChild(titleBar);
 	titleBar.onclick = new RunnableCompatibility() {
 		public void run() {
-			bringToTop();
-			if(contentHandle != null){
-				OS.SetFocus(contentHandle); //contentHandle.focus();
+			if (isVisible()) { // may be invisible after clicking close button
+				bringToTop();
+				if(contentHandle != null){
+					OS.SetFocus(contentHandle); //contentHandle.focus();
+				}
 			}
 			toReturn(true);
 		}
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
@@ -4815,7 +4815,8 @@ public void run() {
 							Display disp = displs[i];
 							if (disp != null && !disp.isDisposed()) {
 								Control ctrl = disp.getControl(src);
-								if (ctrl != null && ctrl instanceof Shell) {
+								if (ctrl != null && ctrl instanceof Shell
+										&& ctrl.isVisible()) {
 									((Shell) ctrl).bringToTop();
 								}
 							}
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
@@ -280,7 +280,7 @@ public Element addShortcut(String name, String icon, Object clickFun) {
 			 * @j2sNative
 			if (typeof clickFun == "string") {
 				itemDiv.href = clickFun;
-			} else {
+			} else if (clickFun != null) {
 				itemDiv.href = "#";
 				itemDiv.onclick = (function (f) {
 						return function () {
@@ -298,7 +298,7 @@ public Element addShortcut(String name, String icon, Object clickFun) {
 			 * @j2sNative
 			if (typeof clickFun == "string") {
 				itemDiv.href = clickFun;
-			} else {
+			} else if (clickFun != null) {
 				itemDiv.onclick = clickFun;
 			}
 			 */ {}

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,8 @@ void bringToTop (boolean parentShell, boolean childShells) {`
`284`	`284`	`Shell[] children = sh.getShells();`
`285`	`285`	`for (int i = 0; i < children.length; i++) {`
`286`	`286`	`Shell s = children[i];`
`287`		`- if ((s.style & (SWT.APPLICATION_MODAL \| SWT.PRIMARY_MODAL \| SWT.SYSTEM_MODAL)) != 0) {`
	`287`	`+ if ((s.style & (SWT.APPLICATION_MODAL \| SWT.PRIMARY_MODAL \| SWT.SYSTEM_MODAL)) != 0`
	`288`	`+ && s.isVisible() && !s.isDisposed()) {`
`288`	`289`	`s.bringToTop(false, true);`
`289`	`290`	`}`
`290`	`291`	`}`
`@@ -2263,9 +2264,11 @@ public void run() {`
`2263`	`2264`	`handle.appendChild(titleBar);`
`2264`	`2265`	`titleBar.onclick = new RunnableCompatibility() {`
`2265`	`2266`	`public void run() {`
`2266`		`- bringToTop();`
`2267`		`- if(contentHandle != null){`
`2268`		`- OS.SetFocus(contentHandle); //contentHandle.focus();`
	`2267`	`+ if (isVisible()) { // may be invisible after clicking close button`
	`2268`	`+ bringToTop();`
	`2269`	`+ if(contentHandle != null){`
	`2270`	`+ OS.SetFocus(contentHandle); //contentHandle.focus();`
	`2271`	`+ }`
`2269`	`2272`	`}`
`2270`	`2273`	`toReturn(true);`
`2271`	`2274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4815,7 +4815,8 @@ public void run() {`
`4815`	`4815`	`Display disp = displs[i];`
`4816`	`4816`	`if (disp != null && !disp.isDisposed()) {`
`4817`	`4817`	`Control ctrl = disp.getControl(src);`
`4818`		`- if (ctrl != null && ctrl instanceof Shell) {`
	`4818`	`+ if (ctrl != null && ctrl instanceof Shell`
	`4819`	`+ && ctrl.isVisible()) {`
`4819`	`4820`	`((Shell) ctrl).bringToTop();`
`4820`	`4821`	`}`
`4821`	`4822`	`}`