Fixed bug that Menu's width is not correct in IE and Opera.

zhourenjian · zhourenjian · commit 6f0881bb81c1 · 2007-09-29T20:36:04.000Z
Fixed bug that #setImage for *.png after *.gif may result in two images in the background.
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/browser/Browser.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/browser/Browser.java
@@ -1392,15 +1392,19 @@ public boolean setText(String html) {
 	handle.src = "about:blank";
 }
 try {
-	handle.contentWindow.document.write (html);
-	handle.contentWindow.document.close ();
+	var doc = handle.contentWindow.document;
+	doc.open ();
+	doc.write (html);
+	doc.close ();
 } catch (e) {
-	window.setTimeout ((function () {
+	window.setTimeout ((function (handle, html) {
 		return function () {
-			handle.contentWindow.document.write (html);
-			handle.contentWindow.document.close ();
+			var doc = handle.contentWindow.document;
+			doc.open ();
+			doc.write (html);
+			doc.close ();
 		};
-	}) (), 25);
+	}) (handle, html), 25);
 }
  */
 private native void iframeDocumentWrite(Object handle, String html);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Label.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Label.java
@@ -519,6 +519,7 @@ public void setImage (Image image) {
 //				imgBackground.style.height = "100%";
 //				imgBackground.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\"" + this.image.url + "\", sizingMethod=\"image\")";
 //				handle.appendChild(imgBackground);
+			handleStyle.backgroundImage = "";
 			handleStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\"" + this.image.url + "\", sizingMethod=\"image\")";
 		} else {
 			handleStyle.backgroundRepeat = "no-repeat";
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java
@@ -225,8 +225,23 @@ void _setVisible (boolean visible) {
 		style.zIndex = "1" + window.currentTopZIndex;
 		style.display = "block";
 		int height = OS.getContainerHeight(handle);
-		if (OS.isIE) {
-			handle.style.width = "200px";
+		if (OS.isIE || OS.isOpera) {
+			int maxWidth = 0;
+			boolean hasImage = false;
+			boolean hasSelection = false;
+			MenuItem[] children = getItems();
+			for (int i = 0; i < children.length; i++) {
+				MenuItem item = children[i];
+				int width = OS.getStringStyledWidth(item.getText(), "menu-item-text", null);
+				if (item.getImage() != null) {
+					hasImage = true;
+				}
+				if ((item.getStyle() & (SWT.CHECK | SWT.RADIO)) != 0) {
+					hasImage = true;
+				}
+				maxWidth = Math.max(maxWidth, width);
+			}
+			handle.style.width = (maxWidth + (hasImage ? 18 : 0) + (hasSelection ? 18 : 0) + 32) + "px";
 		}
 		int width = OS.getContainerWidth(handle);
 		int left = x, top = y;
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
@@ -11,7 +11,7 @@
 	background-color:buttonface;
 	border-style:solid solid solid none;
 	border-width:1px;
-	border-height:buttonshadow;
+	border-color:buttonshadow;
 	/*opacity:0.25;
 	filter:Alpha(Opacity=25);*/
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`background-color:buttonface;`
`12`	`12`	`border-style:solid solid solid none;`
`13`	`13`	`border-width:1px;`
`14`		`- border-height:buttonshadow;`
	`14`	`+ border-color:buttonshadow;`
`15`	`15`	`/*opacity:0.25;`
`16`	`16`	`filter:Alpha(Opacity=25);*/`
`17`	`17`	`}`