Fixed bug that Shell with style SWT.TOOL does not layout correctly.

zhourenjian · zhourenjian · commit 4fdd9371c72e · 2007-06-28T12:29:50.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
@@ -909,6 +909,9 @@ public Rectangle getClientArea () {
 			//h -= 21;
 			h -= 1 + OS.getContainerHeight(shellMenuBar);
 		}
+	} else if ((style & SWT.TOOL) != 0){
+		h -= 2;
+		w -= 2;
 	} else {
 		h -= 6;
 		w -= 6;
@@ -2298,22 +2301,27 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y
 		titleBar.style.width = ((width - dww) > 0 ? width - dww : 0) + "px";
 		updateShellTitle(width);
 	} else {
-		width -= 4;
-		height -= 4;
-		cx -= 4;
-		cy -= 4;
-		int dw = 4;
-		int dh = 4;
+		int dw = 8;
+		int dh = 8;
+		if ((style & SWT.TOOL) != 0) {
+			dw = 0;
+			dh = 0;
+			contentHandle.style.top = "0px";
+			contentHandle.style.left = "0px";
+			cx -= 2;
+			cy -= 2;
+		} else {
+			contentHandle.style.top = 3 + "px";
+			contentHandle.style.left = 1 + "px";
+			cx -= 4;
+			cy -= 4;
+		}
 //		if ((style & SWT.BORDER) != 0) {
 //			dw -= 2;
 //			dh -= 2;
 //		}
 		contentHandle.style.height = ((height - dh >= 0) ? height - dh : 0) + "px";
 		contentHandle.style.width = (width - dw > 0 ? width - dw : 0) + "px";
-		contentHandle.style.top = 3 + "px";
-		contentHandle.style.left = 1 + "px";
-		width += 4;
-		height += 4;
 	}
 	if ((style & SWT.BORDER) != 0) {
 		cx -= 4;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.css
@@ -39,8 +39,7 @@
 	z-index:3;
 }
 .shell-tool {
-	margin:1px !important;
-	margin-top:-1px !important;
+	margin:0 !important;
 }
 .shell-menu-bar .shell-content {
 	top:44px;

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@`
`39`	`39`	`z-index:3;`
`40`	`40`	`}`
`41`	`41`	`.shell-tool {`
`42`		`- margin:1px !important;`
`43`		`- margin-top:-1px !important;`
	`42`	`+ margin:0 !important;`
`44`	`43`	`}`
`45`	`44`	`.shell-menu-bar .shell-content {`
`46`	`45`	`top:44px;`