Fixed bug on "new Display()" will create another layer of TaskBar, QuickLaunch and others

zhourenjian · zhourenjian · commit 1f08dec96034 · 2008-09-23T14:54:21.000Z
Fixed bug that clicking on taskbar's item does not bring window to top
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
@@ -385,7 +385,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 	if ((style & SWT.NO_TRIM) == 0) {
 		if ((style & (SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX)) != 0) {
 			//height += 20;
-			height += OS.getContainerHeight(titleBar);
+			height += Math.max(OS.getContainerHeight(titleBar), 19);
 			if (width < 105) {
 				width = 105;
 			}
@@ -922,7 +922,7 @@ public Rectangle getClientArea () {
 	int h = height;
 	if ((style & (SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX)) != 0) {
 		//h -= 20;
-		h -= OS.getContainerHeight(titleBar);
+		h -= Math.max(OS.getContainerHeight(titleBar), 19);
 		w -= 8;
 		//h -= 8;
 		h -= 5;
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
@@ -2438,11 +2438,23 @@ protected void init () {
 	if (document.onclick == null) {
 		bringShellToTop();
 	}
-	
+
 	initializeDekstop();
 }
 
 void initializeDekstop() {
+	for (int i = 0; i < Displays.length; i++) {
+		Display disp = Displays[i];
+		if (disp != this && disp != null && !disp.isDisposed()) {
+			taskBar = disp.taskBar;
+			topBar = disp.topBar;
+			shortcutBar = disp.shortcutBar;
+			trayCorner = disp.trayCorner;
+			desktopItems = disp.desktopItems;
+			return;
+		}
+	}
+	
 	if (desktopItems != null) return;
 	
 	desktopItems = new DesktopItem[] {
@@ -3354,6 +3366,18 @@ protected void release () {
 }
 
 void releaseDesktop () {
+	boolean existed = false;
+	for (int i = 0; i < Displays.length; i++) {
+		Display disp = Displays[i];
+		if (disp != this && disp != null && !disp.isDisposed()) {
+			existed = true;
+			break;
+		}
+	}
+	if (existed) {
+		return;
+	}
+
 	for (int i = 0; i < desktopItems.length; i++) {
 		desktopItems[i].releaseWidget();
 	}
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
@@ -161,7 +161,7 @@ public void run() {
 		 */ { }
 		si.appendChild(div);
 		div.appendChild(document.createTextNode(text));
-		int w = OS.getStringStyledWidth(text, "shell-item-text", "");
+		int w = OS.getStringStyledWidth(text, "shell-item-text", "") + 8;
 		if (w > 120) {
 			w = 120;
 		}
@@ -173,6 +173,7 @@ public void run() {
 				@Override
 				public void run() {
 					if (shell.getMinimized()) {
+						shell.setMinimized(false);
 						shell.bringToTop();
 					} else {
 						Shell lastShell = Display.getTopShell();
