Adjust Shell's size and fix a bug that errors occurs when new Shells are created

zhourenjian · zhourenjian · commit c36d64d47452 · 2007-03-04T18:20:36.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
@@ -395,10 +395,10 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 			x -= 4;
 			y -= 4;
 		} else {
-			width += 4;
-			height += 4;
-			x -= 2;
-			y -= 2;
+			width += 6;
+			height += 6;
+			x -= 3;
+			y -= 3;
 		}
 	}
 //	System.err.println( new Rectangle (x, y, width, height));
@@ -2366,16 +2366,16 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y
 		height -= 4;
 		cx -= 4;
 		cy -= 4;
-		int dw = 6;
-		int dh = 6;
+		int dw = 4;
+		int dh = 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 = 2 + "px";
-		contentHandle.style.marginRight = 1 + "px";
+		contentHandle.style.top = 3 + "px";
+		contentHandle.style.left = 1 + "px";
 	}
 	if ((style & SWT.BORDER) != 0) {
 		cx -= 4;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ShellManager.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ShellManager.css
@@ -12,8 +12,8 @@
 	border-style:solid solid solid none;
 	border-width:1px;
 	border-height:buttonshadow;
-	opacity:0.25;
-	filter:Alpha(Opacity=25);
+	/*opacity:0.25;
+	filter:Alpha(Opacity=25);*/
 }
 .shell-item, a.shell-item {
 	display:block;
@@ -27,8 +27,8 @@
 	background-color:buttonface;
 	border:1px solid buttonshadow;
 	color:buttontext;
-	opacity:0.55;
-	filter:Alpha(Opacity=55);
+	/*opacity:0.55;
+	filter:Alpha(Opacity=55);*/
 }
 .shell-item:hover, a.shell-item:hover {
 	opacity:0.85;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ShellManager.js b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ShellManager.js
@@ -346,7 +346,7 @@ sm.updateItems = function () {
 		var item = this.items[i];
 		item.itemHandle.style.top = offset + (i * hh + 24) + "px";
 		if (item.shell != null && item.shell.getText () != item.text) {
-			for (var j = item.textHandle.childNodes.length; j >= 0; j--) {
+			for (var j = item.textHandle.childNodes.length - 1; j >= 0; j--) {
 				item.textHandle.removeChild (item.textHandle.childNodes[j]);
 			}
 			item.textHandle.appendChild (document.createTextNode (item.shell.getText ()));

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ sm.updateItems = function () {`
`346`	`346`	`var item = this.items[i];`
`347`	`347`	`item.itemHandle.style.top = offset + (i * hh + 24) + "px";`
`348`	`348`	`if (item.shell != null && item.shell.getText () != item.text) {`
`349`		`- for (var j = item.textHandle.childNodes.length; j >= 0; j--) {`
	`349`	`+ for (var j = item.textHandle.childNodes.length - 1; j >= 0; j--) {`
`350`	`350`	`item.textHandle.removeChild (item.textHandle.childNodes[j]);`
`351`	`351`	`}`
`352`	`352`	`item.textHandle.appendChild (document.createTextNode (item.shell.getText ()));`