1. Support different colors in title bar to indicate different selection status of given window

zhourenjian · zhourenjian · commit 60d242907d06 · 2008-10-04T16:06:41.000Z
2. Does not list child Shell in task bar
3. Use system default highlight theme for task bar and quick launch bar.
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
@@ -204,6 +204,20 @@ void addMenu (Menu menu) {
 }
 
 void bringToTop () {
+	bringToTop(true, true);
+}
+
+void bringToTop (boolean parentShell, boolean childShells) {
+	if (parentShell && childShells) {
+		Display.deactivateAllTitleBarShells();
+	}
+	if (parentShell && parent != null && parent instanceof Decorations) {
+		((Decorations) parent).bringToTop(true, false);
+	}
+	if (titleBar != null) {
+		titleBar.style.backgroundColor = "activecaption";
+		shellTitle.style.color = "captiontext";
+	}
 	/*
 	* This code is intentionally commented.  On some platforms,
 	* the ON_TOP style creates a shell that will stay on top
@@ -261,6 +275,16 @@ void bringToTop () {
 		}
 		// widget could be disposed at this point
 //	}
+	if (childShells && this instanceof Shell) {
+		Shell sh = (Shell) this;
+		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) {
+				s.bringToTop(false, true);
+			}
+		}
+	}
 }
 
 static int checkStyle (int style) {
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
@@ -480,7 +480,6 @@ public Display () {
  */
 public Display (DeviceData data) {
 	super (data);
-	System.out.println("hi...");
 }
 
 /*
@@ -4538,6 +4537,23 @@ static Shell getTopShell() {
 	return lastShell;
 }
 
+static void deactivateAllTitleBarShells() {
+	Shell lastShell = null;
+	int lastZIndex = 0;
+	Display[] disps = Displays;
+	for (int k = 0; k < disps.length; k++) {
+		if (disps[k] == null) continue;
+		Shell[] ss = disps[k].getShells ();
+		for (int i = 0; i < ss.length; i++) {
+			if (!ss[i].isDisposed () && ss[i].titleBar != null
+					&& ss[i].handle.style.display != "none") {
+				ss[i].titleBar.style.backgroundColor = "inactivecaption";
+				ss[i].shellTitle.style.color = "inactivecaptiontext";
+			}
+		}
+	}
+}
+
 static Shell getTopMaximizedShell() {
 	// find the top maximized shell
 	Shell lastShell = null;
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
@@ -42,8 +42,10 @@
 }
 .shortcut-item:hover, a.shortcut-item:hover .shortcut-item-highlight {
 	border:1px solid navy;
-	opacity:0.95;
-	filter:Alpha(Opacity=95);
+	background-color:highlight;
+	color:highlighttext;
+	opacity:0.85;
+	filter:Alpha(Opacity=85);
 }
 .shortcut-active-item {
 	/*border:1px solid darkred;*/
@@ -52,8 +54,10 @@
 }
 .shortcut-active-item:hover, a.shortcut-active-item:hover {
 	/*border:1px solid navy;*/
-	opacity:0.6;
-	filter:Alpha(Opacity=60);
+	background-color:highlight;
+	color:highlighttext;
+	opacity:0.85;
+	filter:Alpha(Opacity=85);
 }
 .swt-widgets-quicklaunch {
 	width:324px;
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
@@ -1383,7 +1383,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) {
 public void setVisible (boolean visible) {
 	checkWidget ();
 	
-	if ((this.getStyle() & SWT.TOOL) == 0 && display.taskBar != null) {
+	if (this.parent == null && (this.getStyle() & SWT.TOOL) == 0 && display.taskBar != null) {
 		TaskBar taskBar = display.taskBar;
 		if (!visible) {
 			taskBar.removeShellItem(this);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.css
@@ -42,9 +42,11 @@
 	filter:Alpha(Opacity=55);
 }
 .shell-item:hover, a.shell-item:hover {
+	background-color:highlight;
+	color:highlighttext;
 	border:1px solid navy;
-	opacity:0.95;
-	filter:Alpha(Opacity=95);
+	opacity:0.85;
+	filter:Alpha(Opacity=85);
 }
 .shell-top-item {
 	/*border:1px solid darkred;*/
@@ -53,15 +55,19 @@
 }
 .shell-top-item:hover, a.shell-top-item:hover {
 	/*border:1px solid navy;*/
-	opacity:0.55;
-	filter:Alpha(Opacity=55);
+	background-color:highlight;
+	color:highlighttext;
+	opacity:0.85;
+	filter:Alpha(Opacity=85);
+	/*opacity:0.55;
+	filter:Alpha(Opacity=55);*/
 }
 a.shell-item:focus {
 	background-color:buttonhighlight;
 }
 .shell-item-icon {
 	float:left;
-	background-color:buttonface;
+	/*background-color:buttonface;*/
 	background-repeat:no-repeat;
 	background-position:center center;
 	background-image:url('images/shell-packed.gif');
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
@@ -332,9 +332,14 @@ public void updateItems() {
 						handleStyle.filter = "";
 					}
 				}
-				item.itemHandle.style.borderColor = item.shell.getMinimized() ? "buttonshadow"
-						: "";
-				if (item.shell == topShell) {
+				item.itemHandle.style.borderColor = item.shell.getMinimized() ? "buttonshadow" : "";
+				boolean isTopShell = item.shell == topShell;
+				Shell sh = topShell;
+				while (!isTopShell && sh != null) {
+					isTopShell = item.shell == sh;
+					sh = (Shell) sh.parent;
+				}
+				if (isTopShell) {
 					OS.addCSSClass(item.itemHandle, "shell-top-item");
 				} else {
 					OS.removeCSSClass(item.itemHandle, "shell-top-item");
