Commita28f889

zhourenjian

committed

Fixing bug#2321790: Not setting icon for new Shell() results in JavaScript error.

1 parent75ad37a commita28f889Copy full SHA for a28f889

File tree

-2

lines changed

sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets
- Decorations.java
- TaskBar.java

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2101,7 +2101,7 @@ void setSystemMenu () {`
`2101`	`2101`	`}`
`2102`	`2102`	`*/ {}`
`2103`	`2103`
`2104`		`-if ((style &SWT.BORDER) ==0\|\| (style &SWT.RESIZE) !=0) {`
	`2104`	`+if ((style &SWT.TOOL) ==0&& (style &(SWT.CLOSE \|SWT.MIN \|SWT.MAX)) !=0) {`
`2105`	`2105`	`shellIcon =document.createElement("DIV");`
`2106`	`2106`	`shellIcon.className ="shell-title-icon";`
`2107`	`2107`	`titleBar.appendChild(shellIcon);`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,10 @@ public void updateItems() {`
`326`	`326`	`handleStyle.backgroundImage ="url(\"" +image.url +"\")";`
`327`	`327`	`}`
`328`	`328`	`}else {`
`329`		`-StringcssClazzName =item.shell.shellIcon.className;`
	`329`	`+StringcssClazzName =null;`
	`330`	`+if (item.shell.shellIcon !=null) {`
	`331`	`+cssClazzName =item.shell.shellIcon.className;`
	`332`	`+}`
`330`	`333`	`if (cssClazzName !=null &&cssClazzName.indexOf("shell-title-icon-console") != -1) {`
`331`	`334`	`OS.addCSSClass(item.iconHandle,"shell-item-icon-console");`
`332`	`335`	`}`

Comments

(0)