[CWM] Duke icon on macOS

GitOrigin-RevId: 49dd87dc6d510a8fb52b301e14c98c2ef7faa0ea

diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
index 94562d1576c0aac8b3899cdbb1956e97e108e7b1..fe52f5357e2f7747fcbb3e12a1827faca060b8ab 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
@@ -96,7 +96,7 @@ public final class AppUIUtil {
       if (!SystemInfoRt.isMac) {
         window.setIconImages(images);
       }
-      else if (!ourMacDocIconSet && PluginManagerCore.isRunningFromSources()) {
+      else if (!ourMacDocIconSet && (PlatformUtils.isIntelliJClient() || PluginManagerCore.isRunningFromSources())) {
         MacAppIcon.setDockIcon(ImageUtil.toBufferedImage(images.get(0)));
         ourMacDocIconSet = true;
       }
@@ -105,7 +105,7 @@ public final class AppUIUtil {
 
   public static boolean isWindowIconAlreadyExternallySet() {
     if (SystemInfoRt.isMac) {
-      return ourMacDocIconSet || !PluginManagerCore.isRunningFromSources();
+      return ourMacDocIconSet || (!PlatformUtils.isIntelliJClient() && !PluginManagerCore.isRunningFromSources());
     }
 
     // todo[tav] 'jbre.win.app.icon.supported' is defined by JBRE, remove when OpenJDK supports it as well