Shells no longer set their image on Mac, so that they don't hijack the dock icon.

Author: nedtwigg

CHANGES.md

@@ -5,6 +5,7 @@
 - Added `FlatBtn.setBackground` and `FlatBtn.setSelection`.
 - Added `Shells.dontSetPositionOrSize` and `Shells.setCloseOnEscape`.
 - Shells now reposition themselves if they were going to open offscreen.
+- Shells no longer set their image on Mac, so that they don't hijack the dock icon.
 - Added `ControlWrapper.transparent` for efficiently passing `Control` to `ControlWrapper`.
 - Improved `StructuredDrop.handler`.
 

durian-swt/src/main/java/com/diffplug/common/swt/Shells.java

@@ -36,6 +36,7 @@
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.collect.Maps;
+import com.diffplug.common.swt.os.WS;
 import com.diffplug.common.tree.TreeIterable;
 import com.diffplug.common.tree.TreeQuery;
 import com.diffplug.common.tree.TreeStream;
@@ -354,7 +355,7 @@ private void setupShell(Shell shell) {
 		if (title != null) {
 			shell.setText(title);
 		}
-		if (image != null) {
+		if (image != null && WS.getRunning() != WS.COCOA) {
 			shell.setImage(image);
 		}
 		if (alpha != SWT.DEFAULT) {