Fixing Shell's focusing issue: Miminizing a Shell object will activate the next Shell object correctly

zhourenjian · zhourenjian · commit 1d7f736e1552 · 2009-04-26T08:12:30.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
@@ -2003,6 +2003,7 @@ public void setMinimized (boolean minimized) {
 			Shell topShell = Display.getTopShell();
 			if (topShell != null) {
 				topShell.bringToTop();
+				topShell.forceFocus();
 			} else 
 			/**
 			 * Return to default title
@@ -2205,6 +2206,8 @@ public void run() {
 				if (display.topBar != null) {
 					display.topBar.returnTopMaximized((Shell) shell);
 				}
+				toReturn(false);
+				new HTMLEventWrapper(getEvent()).stopPropagation();
 			}
 		};
 	}
@@ -2272,9 +2275,12 @@ public void run() {
 		public void run() {
 			if (isVisible()) { // may be invisible after clicking close button
 				bringToTop();
+				forceFocus();
+				/*
 				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/QuickLaunch.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.css
@@ -41,6 +41,12 @@
 	opacity:0.85;
 	filter:Alpha(Opacity=85);
 }
+* html .shortcut-bar {
+	bottom:-1px;
+}
+* html .shortcut-bar-minimized {
+	bottom:-1px;
+}
 .shortcut-item:hover, a.shortcut-item:hover .shortcut-item-highlight {
 	border:1px solid navy;
 	background-color:highlight;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.java
@@ -501,10 +501,17 @@ public void close () {
 		taskBar.setMinimized(false);
 		taskBar.updateLastModified();
 	}
+	Shell nextShell = null;
+	if (parent instanceof Shell) {
+		nextShell = (Shell) parent;
+	}
 	closeWidget ();
-	Shell topShell = Display.getTopShell();
-	if (topShell != null && !topShell.isDisposed()) {
-		topShell.bringToTop();
+	if (nextShell == null || nextShell.isDisposed()) {
+		nextShell = Display.getTopShell();
+	}
+	if (nextShell != null && !nextShell.isDisposed()) {
+		nextShell.bringToTop();
+		nextShell.forceFocus();
 	} else 
 	/**
 	 * Return to default title

Original file line number	Diff line number	Diff line change
`@@ -2003,6 +2003,7 @@ public void setMinimized (boolean minimized) {`
`2003`	`2003`	`Shell topShell = Display.getTopShell();`
`2004`	`2004`	`if (topShell != null) {`
`2005`	`2005`	`topShell.bringToTop();`
	`2006`	`+ topShell.forceFocus();`
`2006`	`2007`	`} else`
`2007`	`2008`	`/**`
`2008`	`2009`	`* Return to default title`
`@@ -2205,6 +2206,8 @@ public void run() {`
`2205`	`2206`	`if (display.topBar != null) {`
`2206`	`2207`	`display.topBar.returnTopMaximized((Shell) shell);`
`2207`	`2208`	`}`
	`2209`	`+ toReturn(false);`
	`2210`	`+ new HTMLEventWrapper(getEvent()).stopPropagation();`
`2208`	`2211`	`}`
`2209`	`2212`	`};`
`2210`	`2213`	`}`
`@@ -2272,9 +2275,12 @@ public void run() {`
`2272`	`2275`	`public void run() {`
`2273`	`2276`	`if (isVisible()) { // may be invisible after clicking close button`
`2274`	`2277`	`bringToTop();`
	`2278`	`+ forceFocus();`
	`2279`	`+ /*`
`2275`	`2280`	`if(contentHandle != null){`
`2276`	`2281`	`OS.SetFocus(contentHandle); //contentHandle.focus();`
`2277`	`2282`	`}`
	`2283`	`+ */`
`2278`	`2284`	`}`
`2279`	`2285`	`toReturn(true);`
`2280`	`2286`	`}`